Normalize JIDs passed to Spake2Authenticator.

remoting/client/chromoting_client.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/client/chromoting_client.h"
 
 #include <utility>
 
 #include "remoting/base/capabilities.h"
 #include "remoting/client/audio_decode_scheduler.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/ice_connection_to_host.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/negotiating_client_authenticator.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/video_renderer.h"
 #include "remoting/protocol/webrtc_connection_to_host.h"
+#include "remoting/signaling/jid_util.h"
 
 namespace remoting {
 
 ChromotingClient::ChromotingClient(ClientContext* client_context,
                                    ClientUserInterface* user_interface,
                                    protocol::VideoRenderer* video_renderer,
                                    scoped_ptr<AudioPlayer> audio_player)
     : user_interface_(user_interface), video_renderer_(video_renderer) {
   DCHECK(client_context->main_task_runner()->BelongsToCurrentThread());
   if (audio_player) {
@@ skipping 20 matching lines @@
 
 void ChromotingClient::Start(
     SignalStrategy* signal_strategy,
     const protocol::ClientAuthenticationConfig& client_auth_config,
     scoped_refptr<protocol::TransportContext> transport_context,
     const std::string& host_jid,
     const std::string& capabilities) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!session_manager_);  // Start must be called more than once.
 
-  host_jid_ = host_jid;
+  host_jid_ = NormalizeJid(host_jid);
   local_capabilities_ = capabilities;
 
   if (!protocol_config_)
     protocol_config_ = protocol::CandidateSessionConfig::CreateDefault();
   if (!audio_decode_scheduler_)
     protocol_config_->DisableAudioChannel();
 
   if (!connection_) {
     if (protocol_config_->webrtc_supported()) {
       DCHECK(!protocol_config_->ice_supported());
@@ skipping 134 matching lines @@
     const buzz::XmlElement* stanza) {
   return false;
 }
 
 void ChromotingClient::StartConnection() {
   DCHECK(thread_checker_.CalledOnValidThread());
   connection_->Connect(
       session_manager_->Connect(
           host_jid_,
           make_scoped_ptr(new protocol::NegotiatingClientAuthenticator(
-              signal_strategy_->GetLocalJid(), host_jid_,
+              NormalizeJid(signal_strategy_->GetLocalJid()), host_jid_,
               client_auth_config_))),
       transport_context_, this);
 }
 
 void ChromotingClient::OnAuthenticated() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Initialize the decoder.
   if (connection_->config().is_audio_enabled())
     audio_decode_scheduler_->Initialize(connection_->config());
 }
 
 void ChromotingClient::OnChannelsConnected() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Negotiate capabilities with the host.
   VLOG(1) << "Client capabilities: " << local_capabilities_;
 
   protocol::Capabilities capabilities;
   capabilities.set_capabilities(local_capabilities_);
   connection_->host_stub()->SetCapabilities(capabilities);
 }
 
 }  // namespace remoting