Use Authenticator interface in Session and SessionManager

remoting/host/chromoting_host.cc

Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 0a8cfcd7b746f39f2a916c78af238ead811fd296..33799392d0851cafe4de76385b31679dcd7b00ee 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -18,7 +18,6 @@
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/host_config.h"
-#include "remoting/host/host_key_pair.h"
 #include "remoting/host/screen_recorder.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/connection_to_client.h"
@@ -27,6 +26,7 @@
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/session_config.h"
+#include "remoting/protocol/v1_authenticator.h"
 
 using remoting::protocol::ConnectionToClient;
 using remoting::protocol::InputStub;
@@ -77,6 +77,12 @@ void ChromotingHost::Start() {
     return;
   state_ = kStarted;
 
+  // Assign key and certificate to server.
+  if (!key_pair_.Load(config_)) {
+    LOG(ERROR) << "Failed to load key pair for the host.";
+    return;
+  }
+
   // Use an XMPP connection to the Talk network for session signalling.
   std::string xmpp_login;
   std::string xmpp_auth_token;
@@ -155,6 +161,14 @@ void ChromotingHost::AddStatusObserver(HostStatusObserver* observer) {
   status_observers_.push_back(observer);
 }
 
+void ChromotingHost::SetSharedSecret(const std::string& shared_secret) {
+  DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
+  session_manager_->set_authenticator_factory(
+      new protocol::V1HostAuthenticatorFactory(
+          key_pair_.GenerateCertificate(), key_pair_.CopyPrivateKey(),
+          shared_secret));
+}
+
 ////////////////////////////////////////////////////////////////////////////
 // protocol::ClientSession::EventHandler implementation.
 void ChromotingHost::OnSessionAuthenticated(ClientSession* client) {
@@ -262,14 +276,8 @@ void ChromotingHost::OnStateChange(
     // TODO(ajwong): Make this a command switch when we're more stable.
     server->set_allow_local_ips(true);
 
-    // Assign key and certificate to server.
-    HostKeyPair key_pair;
-    CHECK(key_pair.Load(config_))
-        << "Failed to load server authentication data";
-
-    server->Init(local_jid_, signal_strategy_.get(), this,
-                 key_pair.CopyPrivateKey(), key_pair.GenerateCertificate(),
-                 allow_nat_traversal_);
+    server->Init(local_jid_, signal_strategy_.get(),
+                 this, allow_nat_traversal_);
 
     session_manager_.reset(server);
 
@@ -332,8 +340,6 @@ void ChromotingHost::OnIncomingSession(
   }
 
   session->set_config(config);
-  // Provide the Access Code as shared secret for SSL channel authentication.
-  session->set_shared_secret(access_code_);
 
   *response = protocol::SessionManager::ACCEPT;