Host-side third party token validation

remoting/protocol/me2me_host_authenticator_factory.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.
 
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 
 #include "base/base64.h"
 #include "base/string_util.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/channel_authenticator.h"
@@ skipping 43 matching lines @@
 
  protected:
   State state_;
 };
 
 }  // namespace
 
 Me2MeHostAuthenticatorFactory::Me2MeHostAuthenticatorFactory(
     const std::string& local_cert,
     scoped_refptr<RsaKeyPair> key_pair,
-    const SharedSecretHash& shared_secret_hash)
+    const SharedSecretHash& shared_secret_hash,
+    scoped_ptr<ThirdPartyHostAuthenticator::TokenValidatorFactory>
+        token_validator_factory)
     : local_cert_(local_cert),
       key_pair_(key_pair),
-      shared_secret_hash_(shared_secret_hash) {
+      shared_secret_hash_(shared_secret_hash),
+      token_validator_factory_(token_validator_factory.Pass()) {
 }
 
 Me2MeHostAuthenticatorFactory::~Me2MeHostAuthenticatorFactory() {
 }
 
 scoped_ptr<Authenticator> Me2MeHostAuthenticatorFactory::CreateAuthenticator(
     const std::string& local_jid,
     const std::string& remote_jid,
     const buzz::XmlElement* first_message) {
 
   size_t slash_pos = local_jid.find('/');
   if (slash_pos == std::string::npos) {
     LOG(DFATAL) << "Invalid local JID:" << local_jid;
     return scoped_ptr<Authenticator>(new RejectingAuthenticator());
   }
 
   // Verify that the client's jid is an ASCII string, and then check
   // that the client has the same bare jid as the host, i.e. client's
   // full JID starts with host's bare jid. Comparison is case
   // insensitive.
   if (!IsStringASCII(remote_jid) ||
       !StartsWithASCII(remote_jid, local_jid.substr(0, slash_pos + 1), false)) {
     LOG(ERROR) << "Rejecting incoming connection from " << remote_jid;
     return scoped_ptr<Authenticator>(new RejectingAuthenticator());
   }
 
-  return scoped_ptr<Authenticator>(new NegotiatingHostAuthenticator(
+  if (token_validator_factory_->IsEnabled()) {
+    return NegotiatingHostAuthenticator::CreateWithThirdPartyAuth(
+        local_cert_, key_pair_, token_validator_factory_->CreateTokenValidator(
+            local_jid, remote_jid));
+  }

[Wez, 2013/04/05 22:46:12]

nit: blank line after this

[rmsousa, 2013/04/06 00:37:25]

Done.

+  return NegotiatingHostAuthenticator::CreateWithSharedSecret(
       local_cert_, key_pair_, shared_secret_hash_.value,
-      shared_secret_hash_.hash_function));
+      shared_secret_hash_.hash_function);
 }
 
 }  // namespace protocol
 }  // namespace remoting