Normalize JIDs passed to Spake2Authenticator.

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 <utility>
 
 #include "base/base64.h"
 #include "base/strings/string_util.h"
@@ skipping 98 matching lines @@
                         std::string("@") + required_client_domain_,
                         base::CompareCase::INSENSITIVE_ASCII)) {
       LOG(ERROR) << "Rejecting incoming connection from " << remote_jid
                  << ": Domain mismatch.";
       return make_scoped_ptr(
           new RejectingAuthenticator(Authenticator::INVALID_CREDENTIALS));
     }
   }
 
   if (!local_cert_.empty() && key_pair_.get()) {
+    std::string normalized_local_jid = NormalizeJid(local_jid);
+    std::string normalized_remote_jid = NormalizeJid(remote_jid);
+
     if (token_validator_factory_) {
       return NegotiatingHostAuthenticator::CreateWithThirdPartyAuth(
-          local_jid, remote_jid, local_cert_, key_pair_,
+          normalized_local_jid, normalized_remote_jid, local_cert_, key_pair_,
           token_validator_factory_);
     }
 
     return NegotiatingHostAuthenticator::CreateWithPin(
-        local_jid, remote_jid, local_cert_, key_pair_, pin_hash_,
-        pairing_registry_);
+        normalized_local_jid, normalized_remote_jid, local_cert_, key_pair_,
+        pin_hash_, pairing_registry_);
   }
 
   return make_scoped_ptr(
       new RejectingAuthenticator(Authenticator::INVALID_CREDENTIALS));
 }
 
 }  // namespace protocol
 }  // namespace remoting