PairingAuthenticator implementation and plumbing.

remoting/protocol/negotiating_host_authenticator.h

 // Copyright 2013 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_PROTOCOL_NEGOTIATING_HOST_AUTHENTICATOR_H_
 #define REMOTING_PROTOCOL_NEGOTIATING_HOST_AUTHENTICATOR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "remoting/protocol/authentication_method.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/negotiating_authenticator_base.h"
+#include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/third_party_host_authenticator.h"
 
 namespace remoting {
 
 class RsaKeyPair;
 
 namespace protocol {
 
 // Host-side implementation of NegotiatingAuthenticatorBase.
 // See comments in negotiating_authenticator_base.h for a general explanation.
 class NegotiatingHostAuthenticator : public NegotiatingAuthenticatorBase {
  public:
   virtual ~NegotiatingHostAuthenticator();
 
   // Creates a host authenticator, using a fixed shared secret/PIN hash.

[Wez, 2013/05/18 20:08:36]

nit: Can we updated this e.g. to "... using the supplied PIN / Access Code's
|shared_secret_hash|."?

[Jamie, 2013/05/21 01:24:34]

I don't think that's any clearer than what we have now.

+  // If a pairing registry is provided, then it will support the SpakePair
+  // authentication for PIN-less authentication; to disable this, pass a
+  // NULL pairing registry.

[Wez, 2013/05/18 20:08:36]

nit: Suggest "If |pairing_registry| is non-NULL then the SpakePair method will
be offered, supporting PIN-less authentication."

[Jamie, 2013/05/21 01:24:34]

Done.

   static scoped_ptr<Authenticator> CreateWithSharedSecret(
       const std::string& local_cert,
       scoped_refptr<RsaKeyPair> key_pair,
       const std::string& shared_secret_hash,
-      AuthenticationMethod::HashFunction hash_function);
+      AuthenticationMethod::HashFunction hash_function,
+      scoped_refptr<PairingRegistry> pairing_registry);
 
   // Creates a host authenticator, using third party authentication.
   static scoped_ptr<Authenticator> CreateWithThirdPartyAuth(
       const std::string& local_cert,
       scoped_refptr<RsaKeyPair> key_pair,
       scoped_ptr<ThirdPartyHostAuthenticator::TokenValidator> token_validator);
 
   // Overriden from Authenticator.
   virtual void ProcessMessage(const buzz::XmlElement* message,
                               const base::Closure& resume_callback) OVERRIDE;
@@ skipping 13 matching lines @@
 
   std::string local_cert_;
   scoped_refptr<RsaKeyPair> local_key_pair_;
 
   // Used only for shared secret host authenticators.
   std::string shared_secret_hash_;
 
   // Used only for third party host authenticators.
   scoped_ptr<ThirdPartyHostAuthenticator::TokenValidator> token_validator_;
 
+  // Used only for pairing authenticators.
+  scoped_refptr<PairingRegistry> pairing_registry_;
+
   DISALLOW_COPY_AND_ASSIGN(NegotiatingHostAuthenticator);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_NEGOTIATING_HOST_AUTHENTICATOR_H_