[Chromoting] Hook up host talkgadget policy checks.

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"
@@ skipping 18 matching lines @@
 #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/constants.h"
 #include "remoting/host/desktop_environment.h"
+#include "remoting/host/dns_blackhole_checker.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"
 #include "remoting/host/session_manager_factory.h"
 #include "remoting/host/signaling_connector.h"
@@ skipping 322 matching lines @@
     }
     if (policies->GetBoolean(policy_hack::PolicyWatcher::kNatPolicyName,
                              &bool_value)) {
       OnNatPolicyUpdate(bool_value);
     }
     if (policies->GetBoolean(
             policy_hack::PolicyWatcher::kHostRequireCurtainPolicyName,
             &bool_value)) {
       OnCurtainPolicyUpdate(bool_value);
     }
+    if (policies->GetString(
+            policy_hack::PolicyWatcher::kHostTalkGadgetPrefixPolicyName,
+            &string_value)) {
+      OnHostTalkGadgetPrefixPolicyUpdate(string_value);
+    }
   }
 
   void OnHostDomainPolicyUpdate(const std::string& host_domain) {
     if (!context_->network_task_runner()->BelongsToCurrentThread()) {
       context_->network_task_runner()->PostTask(FROM_HERE, base::Bind(
           &HostProcess::OnHostDomainPolicyUpdate, base::Unretained(this),
           host_domain));
       return;
     }
 
@@ skipping 47 matching lines @@
 
       host_->AddStatusObserver(&curtain_);
       curtain_.SetEnabled(true);
     } else {
       curtain_.SetEnabled(false);
       host_->RemoveStatusObserver(&curtain_);
     }
 #endif
   }
 
+  void OnHostTalkGadgetPrefixPolicyUpdate(
+      const std::string& talkgadget_prefix) {
+    if (!context_->network_task_runner()->BelongsToCurrentThread()) {
+      context_->network_task_runner()->PostTask(FROM_HERE, base::Bind(
+          &HostProcess::OnHostTalkGadgetPrefixPolicyUpdate,
+          base::Unretained(this), talkgadget_prefix));
+      return;
+    }
+
+    if (talkgadget_prefix != talkgadget_prefix_) {
+      LOG(INFO) << "Restarting host due to updated talkgadget policy:";
+      talkgadget_prefix_ = talkgadget_prefix;
+      RestartHost();
+    }
+  }
+
   void StartHost() {
     DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
     DCHECK(!host_);
+    DCHECK(!signal_strategy_.get());
+    DCHECK(!dns_blackhole_checker_.get());
 
     if (shutting_down_)
       return;
 
-    if (!signal_strategy_.get()) {
-      signal_strategy_.reset(
-          new XmppSignalStrategy(context_->url_request_context_getter(),
-                                 xmpp_login_, xmpp_auth_token_,
-                                 xmpp_auth_service_));
+    signal_strategy_.reset(
+        new XmppSignalStrategy(context_->url_request_context_getter(),
+                               xmpp_login_, xmpp_auth_token_,
+                               xmpp_auth_service_));
 
-      signaling_connector_.reset(new SignalingConnector(
-          signal_strategy_.get(),
-          base::Bind(&HostProcess::OnAuthFailed, base::Unretained(this))));
+    dns_blackhole_checker_.reset(
+        new DnsBlackholeChecker(context_.get(), talkgadget_prefix_));
 
-      if (!oauth_refresh_token_.empty()) {
-        OAuthClientInfo client_info = {
-          kUnofficialOAuth2ClientId,
-          kUnofficialOAuth2ClientSecret
+    signaling_connector_.reset(new SignalingConnector(
+        signal_strategy_.get(), context_.get(), dns_blackhole_checker_.get(),
+        base::Bind(&HostProcess::OnAuthFailed, base::Unretained(this))));
+
+    if (!oauth_refresh_token_.empty()) {
+      OAuthClientInfo client_info = {
+        kUnofficialOAuth2ClientId,
+        kUnofficialOAuth2ClientSecret
+      };
+
+#ifdef OFFICIAL_BUILD
+      if (oauth_use_official_client_id_) {
+        OAuthClientInfo official_client_info = {
+          kOfficialOAuth2ClientId,
+          kOfficialOAuth2ClientSecret
         };
 
-#ifdef OFFICIAL_BUILD
-        if (oauth_use_official_client_id_) {
-          OAuthClientInfo official_client_info = {
-            kOfficialOAuth2ClientId,
-            kOfficialOAuth2ClientSecret
-          };
-
-          client_info = official_client_info;
-        }
+        client_info = official_client_info;
+      }
 #endif  // OFFICIAL_BUILD
 
-        scoped_ptr<SignalingConnector::OAuthCredentials> oauth_credentials(
-            new SignalingConnector::OAuthCredentials(
-                xmpp_login_, oauth_refresh_token_, client_info));
-        signaling_connector_->EnableOAuth(
-            oauth_credentials.Pass(),
-            context_->url_request_context_getter());
-      }
+      scoped_ptr<SignalingConnector::OAuthCredentials> oauth_credentials(
+          new SignalingConnector::OAuthCredentials(
+              xmpp_login_, oauth_refresh_token_, client_info));
+      signaling_connector_->EnableOAuth(oauth_credentials.Pass());
     }
 
     if (!desktop_environment_.get()) {
       desktop_environment_ =
           DesktopEnvironment::CreateForService(context_.get());
     }
 
     NetworkSettings network_settings(
         allow_nat_traversal_ ?
         NetworkSettings::NAT_TRAVERSAL_ENABLED :
@@ skipping 55 matching lines @@
   }
 
   void RestartOnHostShutdown() {
     DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
 
     if (shutting_down_)
       return;
 
     restarting_ = false;
     host_ = NULL;
-    log_to_server_.reset();
-    host_event_logger_.reset();
-    heartbeat_sender_.reset();
+    ResetHost();
 
     StartHost();
   }
 
   void Shutdown(int exit_code) {
     DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
 
     if (shutting_down_)
       return;
 
     shutting_down_ = true;
     exit_code_ = exit_code;
     if (host_) {
       host_->Shutdown(base::Bind(
           &HostProcess::OnShutdownFinished, base::Unretained(this)));
     } else {
       OnShutdownFinished();
     }
   }
 
   void OnShutdownFinished() {
     DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
 
     // Destroy networking objects while we are on the network thread.
     host_ = NULL;
+    ResetHost();
+
+    message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
+  }
+
+  void ResetHost() {
+    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
+
     host_event_logger_.reset();
     log_to_server_.reset();
     heartbeat_sender_.reset();
     signaling_connector_.reset();
+    dns_blackhole_checker_.reset();
     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_;
 
   FilePath host_config_path_;
   CompositeHostConfig config_;
 
   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_;
+  std::string talkgadget_prefix_;
   scoped_ptr<base::files::FilePathWatcher> config_watcher_;

[Sergey Ulanov, 2012/08/30 18:05:01]

Please add an empty line above this one to separate policy-related members from
config watcher.

[garykac, 2012/08/31 18:28:23]

Done.

   scoped_ptr<base::DelayTimer<HostProcess> > config_updated_timer_;
 
   bool restarting_;
   bool shutting_down_;
 
   scoped_ptr<XmppSignalStrategy> signal_strategy_;
+  scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker_;

[Sergey Ulanov, 2012/08/30 18:05:01]

We don't really use this thing here. Just pass ownership to SignalingConnector?

[garykac, 2012/08/31 18:28:23]

Done.

   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_;
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   scoped_ptr<HostUserInterface> host_user_interface_;
 #endif
 
@@ skipping 93 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)