Use Authenticator interface in Session and SessionManager

remoting/host/chromoting_host.h

 // Copyright (c) 2011 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.
 
 #ifndef REMOTING_HOST_CHROMOTING_HOST_H_
 #define REMOTING_HOST_CHROMOTING_HOST_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/capturer.h"
 #include "remoting/host/client_session.h"
 #include "remoting/host/desktop_environment.h"
+#include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/ui_strings.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 
 namespace remoting {
 
 namespace protocol {
@@ skipping 57 matching lines @@
   // Asynchronously shutdown the host process. |shutdown_task| is
   // called after shutdown is completed.
   void Shutdown(const base::Closure& shutdown_task);
 
   // Adds |observer| to the list of status observers. Doesn't take
   // ownership of |observer|, so |observer| must outlive this
   // object. All status observers must be added before the host is
   // started.
   void AddStatusObserver(HostStatusObserver* observer);
 
+  // Sets shared secret for the host. All incoming connections are
+  // rejected if shared secret isn't set. Must be called on the
+  // network thread after the host is started.
+  void SetSharedSecret(const std::string& shared_secret);

[Wez, 2011/11/25 06:54:11]

Will you be removing this in favour of having the application supply the
AuthenticatorFactory to use?

[Sergey Ulanov, 2011/11/28 18:55:16]

Most probably yes.

+
   ////////////////////////////////////////////////////////////////////////////
   // SignalStrategy::StatusObserver implementation.
   virtual void OnStateChange(
       SignalStrategy::StatusObserver::State state) OVERRIDE;
   virtual void OnJidChange(const std::string& full_jid) OVERRIDE;
 
   ////////////////////////////////////////////////////////////////////////////
   // ClientSession::EventHandler implementation.
   virtual void OnSessionAuthenticated(ClientSession* client) OVERRIDE;
   virtual void OnSessionAuthenticationFailed(ClientSession* client) OVERRIDE;
   virtual void OnSessionClosed(ClientSession* session) OVERRIDE;
   virtual void OnSessionSequenceNumber(ClientSession* session,
                                        int64 sequence_number) OVERRIDE;
 
   // SessionManager::Listener implementation.
   virtual void OnSessionManagerInitialized() OVERRIDE;
   virtual void OnIncomingSession(
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
 
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
 
   // TODO(wez): ChromotingHost shouldn't need to know about Me2Mom.
   void set_it2me(bool is_it2me) {
     is_it2me_ = is_it2me;
   }
-  void set_access_code(const std::string& access_code) {
-    access_code_ = access_code;
-  }
 
   // Notify all active client sessions that local input has been detected, and
   // that remote input should be ignored for a short time.
   void LocalMouseMoved(const SkIPoint& new_pos);
 
   // Pause or unpause the session. While the session is paused, remote input
   // is ignored.
   void PauseSession(bool pause);
 
   const UiStrings& ui_strings() { return ui_strings_; }
@@ skipping 41 matching lines @@
   // Called from Shutdown() or OnScreenRecorderStopped() to finish shutdown.
   void ShutdownFinish();
 
   // Unless specified otherwise all members of this class must be
   // used on the network thread only.
 
   // Parameters specified when the host was created.
   ChromotingHostContext* context_;
   DesktopEnvironment* desktop_environment_;
   scoped_refptr<MutableHostConfig> config_;
+  HostKeyPair key_pair_;
   bool allow_nat_traversal_;
 
   // Connection objects.
   scoped_ptr<SignalStrategy> signal_strategy_;
   std::string local_jid_;
   scoped_ptr<protocol::SessionManager> session_manager_;
 
   // StatusObserverList is thread-safe and can be used on any thread.
   StatusObserverList status_observers_;
 
@@ skipping 25 matching lines @@
   bool is_it2me_;
   std::string access_code_;
   UiStrings ui_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_