[Chromoting] The daemon process now starts the networking process and passes the host configuration…

remoting/host/remoting_me2me_host.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.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/files/file_path_watcher.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_native_library.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "crypto/nss_util.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "net/base/network_change_notifier.h"
 #include "net/socket/ssl_server_socket.h"
 #include "remoting/base/breakpad.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/composite_host_config.h"
+#include "remoting/host/chromoting_messages.h"
 #include "remoting/host/constants.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/heartbeat_sender.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/host_event_logger.h"
 #include "remoting/host/host_user_interface.h"
 #include "remoting/host/log_to_server.h"
 #include "remoting/host/network_settings.h"
 #include "remoting/host/policy_hack/policy_watcher.h"
@@ skipping 16 matching lines @@
 
 // N.B. OS_WIN is defined by including src/base headers.
 #if defined(OS_WIN)
 #include <commctrl.h>
 #endif  // defined(OS_WIN)
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif  // defined(TOOLKIT_GTK)
 
+#if defined(REMOTING_MULTI_PROCESS)
+#include "remoting/host/json_host_config.h"
+#else  // !defined(REMOTING_MULTI_PROCESS)
+#include "base/files/file_path_watcher.h"
+#include "remoting/host/composite_host_config.h"
+#endif  // !defined(REMOTING_MULTI_PROCESS)
+
 namespace {
 
 // This is used for tagging system event logs.
 const char kApplicationName[] = "chromoting";
 
-// The command line switch specifying the name of the Chromoting IPC channel.
-const char kDaemonIpcSwitchName[] = "chromoting-ipc";
+// The command line switch specifying the name of the daemon IPC endpoint.
+const char kDaemonIpcSwitchName[] = "daemon-pipe";
+
+#if !defined(REMOTING_MULTI_PROCESS)
 
 // These are used for parsing the config-file locations from the command line,
 // and for defining the default locations if the switches are not present.
 const char kAuthConfigSwitchName[] = "auth-config";
 const char kHostConfigSwitchName[] = "host-config";
 
 const FilePath::CharType kDefaultHostConfigFile[] =
     FILE_PATH_LITERAL("host.json");
 
+#endif  // !defined(REMOTING_MULTI_PROCESS)
+
 const int kMinPortNumber = 12400;
 const int kMaxPortNumber = 12409;
 
 const char kUnofficialOAuth2ClientId[] =
     "440925447803-2pi3v45bff6tp1rde2f7q6lgbor3o5uj.apps.googleusercontent.com";
 const char kUnofficialOAuth2ClientSecret[] = "W2ieEsG-R1gIA4MMurGrgMc_";
 
 const char kOfficialOAuth2ClientId[] =
     "440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com";
 const char kOfficialOAuth2ClientSecret[] = "Bgur6DFiOMM1h8x-AQpuTQlK";
 
 }  // namespace
 
 namespace remoting {
 
 class HostProcess
     : public HeartbeatSender::Listener,
       public IPC::Listener {
  public:
   HostProcess()
       : message_loop_(MessageLoop::TYPE_UI),
+#if defined(REMOTING_MULTI_PROCESS)
+        config_(FilePath()),
+#endif  // defined(REMOTING_MULTI_PROCESS)
 #ifdef OFFICIAL_BUILD
         oauth_use_official_client_id_(true),
 #else
         oauth_use_official_client_id_(false),
 #endif
         allow_nat_traversal_(true),
         restarting_(false),
         shutting_down_(false),
         exit_code_(kSuccessExitCode)
 #if defined(OS_MACOSX)
       , curtain_(base::Bind(&HostProcess::OnDisconnectRequested,
                             base::Unretained(this)),
                  base::Bind(&HostProcess::OnDisconnectRequested,
                             base::Unretained(this)))
 #endif
   {
     context_.reset(
         new ChromotingHostContext(message_loop_.message_loop_proxy()));
     context_->Start();
     network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+
+#if !defined(REMOTING_MULTI_PROCESS)
     config_updated_timer_.reset(new base::DelayTimer<HostProcess>(
         FROM_HERE, base::TimeDelta::FromSeconds(2), this,
         &HostProcess::ConfigUpdatedDelayed));
+#endif  // !defined(REMOTING_MULTI_PROCESS)
   }
 
   bool InitWithCommandLine(const CommandLine* cmd_line) {
     // Connect to the daemon process.
     std::string channel_name =
         cmd_line->GetSwitchValueASCII(kDaemonIpcSwitchName);
 
 #if defined(REMOTING_MULTI_PROCESS)
     if (channel_name.empty())
       return false;
 #endif  // defined(REMOTING_MULTI_PROCESS)
 
     if (!channel_name.empty()) {
       daemon_channel_.reset(new IPC::ChannelProxy(
           channel_name, IPC::Channel::MODE_CLIENT, this,
           context_->network_task_runner()));
     }
 
+#if !defined(REMOTING_MULTI_PROCESS)
     FilePath default_config_dir = remoting::GetConfigDir();
     if (cmd_line->HasSwitch(kAuthConfigSwitchName)) {
       FilePath path = cmd_line->GetSwitchValuePath(kAuthConfigSwitchName);
       config_.AddConfigPath(path);
     }
 
     host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile);
     if (cmd_line->HasSwitch(kHostConfigSwitchName)) {
       host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName);
     }
     config_.AddConfigPath(host_config_path_);
+#endif  // !defined(REMOTING_MULTI_PROCESS)
 
     return true;
   }
 
+#if defined(REMOTING_MULTI_PROCESS)
+
+  void OnConfigUpdated(const std::string& config) {
+    DCHECK(message_loop_.message_loop_proxy()->BelongsToCurrentThread());
+
+    LOG(INFO) << "Processing new host configuration.";
+
+    if (!config_.SetSerializedData(config)) {
+      LOG(ERROR) << "Invalid configuration.";
+      return;
+    }
+
+    if (!ApplyConfig()) {
+      // TODO(alexeypa): make the process exit with
+      // |kInvalidHostConfigurationExitCode|
+      LOG(ERROR) << "Failed to apply the configuration.";
+      return;
+    }
+
+    // Start watching the policy (and eventually start the host) if this is
+    // the first configuration update. Otherwise, post a task to create new
+    // authenticator factory in case PIN has changed.
+    if (policy_watcher_.get() == NULL) {
+#if defined(OS_MACOSX) || defined(OS_WIN)
+      host_user_interface_.reset(new HostUserInterface(context_.get()));
+#endif
+
+      StartWatchingPolicy();
+    } else {
+      // PostTask to create new authenticator factory in case PIN has changed.
+      context_->network_task_runner()->PostTask(
+          FROM_HERE,
+          base::Bind(&HostProcess::CreateAuthenticatorFactory,
+                     base::Unretained(this)));
+    }
+  }
+
+#else  // !defined(REMOTING_MULTI_PROCESS)
+
   void ConfigUpdated() {
     DCHECK(message_loop_.message_loop_proxy()->BelongsToCurrentThread());
 
     // Call ConfigUpdatedDelayed after a short delay, so that this object won't
     // try to read the updated configuration file before it has been
     // completely written.
     // If the writer moves the new configuration file into place atomically,
     // this delay may not be necessary.
     config_updated_timer_->Reset();
   }
@@ skipping 46 matching lines @@
         new ConfigChangedDelegate(
             message_loop_.message_loop_proxy(),
             base::Bind(&HostProcess::ConfigUpdated, base::Unretained(this))));
     config_watcher_.reset(new base::files::FilePathWatcher());
     if (!config_watcher_->Watch(host_config_path_, delegate)) {
       LOG(ERROR) << "Couldn't watch file " << host_config_path_.value();
     }
 #endif  // defined (OS_WIN)
   }
 
+#endif  // !defined(REMOTING_MULTI_PROCESS)
+
   void CreateAuthenticatorFactory() {
     DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
     scoped_ptr<protocol::AuthenticatorFactory> factory(
         new protocol::Me2MeHostAuthenticatorFactory(
             key_pair_.GenerateCertificate(),
             *key_pair_.private_key(), host_secret_hash_));
     host_->SetAuthenticatorFactory(factory.Pass());
   }
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) {
+    DCHECK(message_loop_.message_loop_proxy()->BelongsToCurrentThread());
+
+#if defined(REMOTING_MULTI_PROCESS)
+    bool handled = true;
+    IPC_BEGIN_MESSAGE_MAP(HostProcess, message)
+        IPC_MESSAGE_HANDLER(ChromotingDaemonNetworkMsg_Configuration,
+                            OnConfigUpdated)
+        IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_END_MESSAGE_MAP()
+    return handled;
+#else  // !defined(REMOTING_MULTI_PROCESS)
     return false;
+#endif  // !defined(REMOTING_MULTI_PROCESS)
   }
 
   int Run() {
+#if !defined(REMOTING_MULTI_PROCESS)
     if (!LoadConfig()) {
       return kInvalidHostConfigurationExitCode;
     }
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
     host_user_interface_.reset(new HostUserInterface(context_.get()));
 #endif
 
     StartWatchingPolicy();
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
     context_->file_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&HostProcess::ListenForConfigChanges,
                    base::Unretained(this)));
 #endif
+#endif  // !defined(REMOTING_MULTI_PROCESS)
+
     message_loop_.Run();
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
     host_user_interface_.reset();
 #endif
 
     daemon_channel_.reset();
     base::WaitableEvent done_event(true, false);
     policy_watcher_->StopWatching(&done_event);
     done_event.Wait();
     policy_watcher_.reset();
 
     return exit_code_;
   }
 
   // Overridden from HeartbeatSender::Listener
   virtual void OnUnknownHostIdError() OVERRIDE {
     LOG(ERROR) << "Host ID not found.";
     Shutdown(kInvalidHostIdExitCode);
   }
 
  private:
   void StartWatchingPolicy() {
     policy_watcher_.reset(
         policy_hack::PolicyWatcher::Create(context_->file_task_runner()));
     policy_watcher_->StartWatching(
         base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)));
   }
 
-  // Read host config, returning true if successful.
-  bool LoadConfig() {
+  // Applies the host config, returning true if successful.
+  bool ApplyConfig() {
     DCHECK(message_loop_.message_loop_proxy()->BelongsToCurrentThread());
 
-    // TODO(sergeyu): There is a potential race condition: this function is
-    // called on the main thread while the class members it mutates are used on
-    // the network thread. Fix it. http://crbug.com/140986 .
-
-    if (!config_.Read()) {
-      LOG(ERROR) << "Failed to read config file.";
-      return false;
-    }
-
     if (!config_.GetString(kHostIdConfigPath, &host_id_)) {
       LOG(ERROR) << "host_id is not defined in the config.";
       return false;
     }
 
     if (!key_pair_.Load(config_)) {
       return false;
     }
 
     std::string host_secret_hash_string;
@@ skipping 29 matching lines @@
     } else if (!config_.GetString(kXmppAuthServiceConfigPath,
                                   &xmpp_auth_service_)) {
       // For the me2me host, we default to ClientLogin token for chromiumsync
       // because earlier versions of the host had no HTTP stack with which to
       // request an OAuth2 access token.
       xmpp_auth_service_ = kChromotingTokenDefaultServiceName;
     }
     return true;
   }
 
+#if !defined(REMOTING_MULTI_PROCESS)
+  // Read host config, returning true if successful.
+  bool LoadConfig() {
+    DCHECK(message_loop_.message_loop_proxy()->BelongsToCurrentThread());
+
+    // TODO(sergeyu): There is a potential race condition: this function is
+    // called on the main thread while the class members it mutates are used on
+    // the network thread. Fix it. http://crbug.com/140986.
+    if (!config_.Read()) {
+      LOG(ERROR) << "Failed to read config file.";
+      return false;
+    }
+
+    return ApplyConfig();
+  }
+#endif  // !defined(REMOTING_MULTI_PROCESS)
+
   void OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies) {
     if (!context_->network_task_runner()->BelongsToCurrentThread()) {
       context_->network_task_runner()->PostTask(FROM_HERE, base::Bind(
           &HostProcess::OnPolicyUpdate, base::Unretained(this),
           base::Passed(&policies)));
       return;
     }
 
     if (!host_) {
       StartHost();
@@ skipping 232 matching lines @@
     signal_strategy_.reset();
 
     message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   MessageLoop message_loop_;
   scoped_ptr<ChromotingHostContext> context_;
   scoped_ptr<IPC::ChannelProxy> daemon_channel_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
 
+#if defined(REMOTING_MULTI_PROCESS)
+  JsonHostConfig config_;
+#else  // !defined(REMOTING_MULTI_PROCESS)
+  CompositeHostConfig config_;
   FilePath host_config_path_;
-  CompositeHostConfig config_;
+  scoped_ptr<base::DelayTimer<HostProcess> > config_updated_timer_;
+  scoped_ptr<base::files::FilePathWatcher> config_watcher_;
+#endif  // !defined(REMOTING_MULTI_PROCESS)
 
   std::string host_id_;
   HostKeyPair key_pair_;
   protocol::SharedSecretHash host_secret_hash_;
   std::string xmpp_login_;
   std::string xmpp_auth_token_;
   std::string xmpp_auth_service_;
 
   std::string oauth_refresh_token_;
   bool oauth_use_official_client_id_;
 
   scoped_ptr<policy_hack::PolicyWatcher> policy_watcher_;
   bool allow_nat_traversal_;
-  scoped_ptr<base::files::FilePathWatcher> config_watcher_;
-  scoped_ptr<base::DelayTimer<HostProcess> > config_updated_timer_;
 
   bool restarting_;
   bool shutting_down_;
 
   scoped_ptr<XmppSignalStrategy> signal_strategy_;
   scoped_ptr<SignalingConnector> signaling_connector_;
   scoped_ptr<DesktopEnvironment> desktop_environment_;
   scoped_ptr<HeartbeatSender> heartbeat_sender_;
   scoped_ptr<LogToServer> log_to_server_;
   scoped_ptr<HostEventLogger> host_event_logger_;
@@ skipping 98 matching lines @@
             user32.GetFunctionPointer("SetProcessDPIAware"));
     set_process_dpi_aware();
   }
 
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif  // defined(OS_WIN)