Update GnubbyAuthHandler to use the current session ID

remoting/host/security_key/gnubby_extension_session.cc

 // Copyright 2016 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 "remoting/host/security_key/gnubby_extension_session.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "remoting/base/logging.h"
+#include "remoting/host/client_session_details.h"
 #include "remoting/host/security_key/gnubby_auth_handler.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/protocol/client_stub.h"
 
 namespace {
 
 // Used as the type attribute of all Security Key protocol::ExtensionMessages.
 const char kExtensionMessageType[] = "gnubby-auth";
 
 // Gnubby extension message data members.
@@ skipping 29 matching lines @@
     }
   }
   return true;
 }
 
 }  // namespace
 
 namespace remoting {
 
 GnubbyExtensionSession::GnubbyExtensionSession(
+    ClientSessionDetails* client_session_details,
     protocol::ClientStub* client_stub)
-    : client_stub_(client_stub) {
+    : client_stub_(client_stub),
+      client_session_details_(client_session_details) {
   DCHECK(client_stub_);
+  DCHECK(client_session_details_);
 
-  gnubby_auth_handler_ = remoting::GnubbyAuthHandler::Create(base::Bind(
-      &GnubbyExtensionSession::SendMessageToClient, base::Unretained(this)));
+  gnubby_auth_handler_ = remoting::GnubbyAuthHandler::Create(
+      base::Bind(&GnubbyExtensionSession::SendMessageToClient,
+                 base::Unretained(this)),
+      base::Bind(&GnubbyExtensionSession::GetDesktopSessionId,
+                 base::Unretained(this)));
 }
 
 GnubbyExtensionSession::~GnubbyExtensionSession() {}
 
 // Returns true if the |message| is a Security Key ExtensionMessage.
 // This is done so the host does not pass |message| to other HostExtensions.
 // TODO(joedow): Use |client_session_details| to disconnect the session if we
 //               receive an invalid extension message.
 bool GnubbyExtensionSession::OnExtensionMessage(
     ClientSessionDetails* client_session_details,
@@ skipping 109 matching lines @@
   std::string request_json;
   CHECK(base::JSONWriter::Write(request, &request_json));
 
   protocol::ExtensionMessage message;
   message.set_type(kExtensionMessageType);
   message.set_data(request_json);
 
   client_stub_->DeliverHostMessage(message);
 }
 
+uint32_t GnubbyExtensionSession::GetDesktopSessionId() const {
+  return client_session_details_->desktop_session_id();
+}
+
 void GnubbyExtensionSession::SetGnubbyAuthHandlerForTesting(
     std::unique_ptr<GnubbyAuthHandler> gnubby_auth_handler) {
   DCHECK(gnubby_auth_handler);
 
   gnubby_auth_handler_ = std::move(gnubby_auth_handler);
   gnubby_auth_handler_->SetSendMessageCallback(base::Bind(
       &GnubbyExtensionSession::SendMessageToClient, base::Unretained(this)));
+  gnubby_auth_handler_->SetSessionIdCallback(base::Bind(
+      &GnubbyExtensionSession::GetDesktopSessionId, base::Unretained(this)));
 }
 
 }  // namespace remoting