Added PIN-less auth policy.

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 196 matching lines @@
 
   void OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies);
   bool OnHostDomainPolicyUpdate(const std::string& host_domain);
   bool OnUsernamePolicyUpdate(bool curtain_required,
                               bool username_match_required);
   bool OnNatPolicyUpdate(bool nat_traversal_enabled);
   void OnCurtainPolicyUpdate(bool curtain_required);
   bool OnHostTalkGadgetPrefixPolicyUpdate(const std::string& talkgadget_prefix);
   bool OnHostTokenUrlPolicyUpdate(const GURL& token_url,
                                   const GURL& token_validation_url);
+  bool OnPairingPolicyUpdate(bool pairing_enabled);
 
   void StartHost();
 
   void OnAuthFailed();
 
   void RestartHost();
 
   // Stops the host and shuts down the process with the specified |exit_code|.
   void ShutdownHost(HostExitCodes exit_code);
 
@@ skipping 33 matching lines @@
   protocol::SharedSecretHash host_secret_hash_;
   scoped_refptr<RsaKeyPair> key_pair_;
   std::string oauth_refresh_token_;
   std::string serialized_config_;
   std::string xmpp_login_;
   std::string xmpp_auth_token_;
   std::string xmpp_auth_service_;
   scoped_ptr<policy_hack::PolicyWatcher> policy_watcher_;
   bool allow_nat_traversal_;
   std::string talkgadget_prefix_;
+  bool allow_pairing_;
 
   bool curtain_required_;
   GURL token_url_;
   GURL token_validation_url_;
 
   scoped_ptr<XmppSignalStrategy> signal_strategy_;
   scoped_ptr<SignalingConnector> signaling_connector_;
   scoped_ptr<HeartbeatSender> heartbeat_sender_;
   scoped_ptr<HostStatusSender> host_status_sender_;
   scoped_ptr<HostChangeNotificationListener> host_change_notification_listener_;
@@ skipping 11 matching lines @@
 
   int* exit_code_out_;
   bool signal_parent_;
 };
 
 HostProcess::HostProcess(scoped_ptr<ChromotingHostContext> context,
                          int* exit_code_out)
     : context_(context.Pass()),
       state_(HOST_INITIALIZING),
       allow_nat_traversal_(true),
+      allow_pairing_(true),
       curtain_required_(false),
 #if defined(REMOTING_MULTI_PROCESS)
       desktop_session_connector_(NULL),
 #endif  // defined(REMOTING_MULTI_PROCESS)
       self_(this),
       exit_code_out_(exit_code_out),
       signal_parent_(false) {
   StartOnUiThread();
 }
 
@@ skipping 164 matching lines @@
     return;
 
   std::string local_certificate = key_pair_->GenerateCertificate();
   if (local_certificate.empty()) {
     LOG(ERROR) << "Failed to generate host certificate.";
     ShutdownHost(kInitializationFailed);
     return;
   }
 
   scoped_refptr<protocol::PairingRegistry> pairing_registry = NULL;
-  scoped_ptr<protocol::PairingRegistry::Delegate> delegate(
-      CreatePairingRegistryDelegate(context_->file_task_runner()));
-  if (delegate) {
-    pairing_registry = new protocol::PairingRegistry(delegate.Pass());
+  if (allow_pairing_) {

[alexeypa (please no reviews), 2013/07/26 23:40:25]

nit:

if (!allow_pairing_)
  return;

[Jamie, 2013/07/27 00:26:22]

We still need to create the authenticator factory.

+    scoped_ptr<protocol::PairingRegistry::Delegate> delegate(
+        CreatePairingRegistryDelegate(context_->file_task_runner()));
+    if (delegate) {

[alexeypa (please no reviews), 2013/07/26 23:40:25]

nit: no need for brackets here.

[Jamie, 2013/07/27 00:26:22]

Done.

+      pairing_registry = new protocol::PairingRegistry(delegate.Pass());
+    }
   }
 
   scoped_ptr<protocol::AuthenticatorFactory> factory;
 
   if (token_url_.is_empty() && token_validation_url_.is_empty()) {
     factory = protocol::Me2MeHostAuthenticatorFactory::CreateWithSharedSecret(
         local_certificate, key_pair_, host_secret_hash_, pairing_registry);
 
   } else if (token_url_.is_valid() && token_validation_url_.is_valid()) {
     scoped_ptr<protocol::ThirdPartyHostAuthenticator::TokenValidatorFactory>
@@ skipping 249 matching lines @@
   std::string token_url_string, token_validation_url_string;
   if (policies->GetString(
           policy_hack::PolicyWatcher::kHostTokenUrlPolicyName,
           &token_url_string) &&
       policies->GetString(
           policy_hack::PolicyWatcher::kHostTokenValidationUrlPolicyName,
           &token_validation_url_string)) {
     restart_required |= OnHostTokenUrlPolicyUpdate(
         GURL(token_url_string), GURL(token_validation_url_string));
   }
+  if (policies->GetBoolean(
+      policy_hack::PolicyWatcher::kHostAllowClientPairing,

[alexeypa (please no reviews), 2013/07/26 23:40:25]

nit: The code directly above uses different indentation for the parameters.

[Jamie, 2013/07/27 00:26:22]

Done.

+      &bool_value)) {
+    restart_required |= OnPairingPolicyUpdate(bool_value);
+  }
 
   if (state_ == HOST_INITIALIZING) {
     StartHost();
   } else if (state_ == HOST_STARTED && restart_required) {
     RestartHost();
   }
 }
 
 bool HostProcess::OnHostDomainPolicyUpdate(const std::string& host_domain) {
   // Returns true if the host has to be restarted after this policy update.
@@ skipping 125 matching lines @@
               << "TokenValidationUrl: " << token_validation_url;
 
     token_url_ = token_url;
     token_validation_url_ = token_validation_url;
     return true;
   }
 
   return false;
 }
 
+bool HostProcess::OnPairingPolicyUpdate(bool allow_pairing) {
+  // Returns true if the host has to be restarted after this policy update.

[alexeypa (please no reviews), 2013/07/26 23:40:25]

nit: This comment should be next to the method declaration, not here.

[Jamie, 2013/07/27 00:26:22]

I've just removed it. I don't think it adds anything.

+  DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
+
+  if (allow_pairing_ != allow_pairing) {

[alexeypa (please no reviews), 2013/07/26 23:40:25]

nit: You can early |return false;| here. It makes the two branches nicely
separated blocks of code.

[Jamie, 2013/07/27 00:26:22]

Done.

+    if (allow_pairing)
+      LOG(INFO) << "Policy enables client pairing.";
+    else
+      LOG(INFO) << "Policy disables client pairing.";
+    allow_pairing_ = allow_pairing;
+    return true;
+  }
+  return false;
+}
+
 void HostProcess::StartHost() {
   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
   DCHECK(!host_);
   DCHECK(!signal_strategy_.get());
   DCHECK(state_ == HOST_INITIALIZING || state_ == HOST_STOPPING_TO_RESTART ||
          state_ == HOST_STOPPED) << state_;
   state_ = HOST_STARTED;
 
   signal_strategy_.reset(
       new XmppSignalStrategy(context_->url_request_context_getter(),
@@ skipping 206 matching lines @@
   return exit_code;
 }
 
 }  // namespace remoting
 
 #if !defined(OS_WIN)
 int main(int argc, char** argv) {
   return remoting::HostMain(argc, argv);
 }
 #endif  // !defined(OS_WIN)