diff options
| author | dharani@chromium.org <dharani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 03:16:02 +0000 |
|---|---|---|
| committer | dharani@chromium.org <dharani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 03:16:02 +0000 |
| commit | 14e66abe9c27f1e728a749950a78f837ac538c73 (patch) | |
| tree | 350f3c5896ecd8512c5ca6753eae92b107eea31c /remoting/host/remoting_me2me_host.cc | |
| parent | c6fd597a6bfb6500312aacb473417abaf7baa831 (diff) | |
| download | chromium_src-14e66abe9c27f1e728a749950a78f837ac538c73.zip chromium_src-14e66abe9c27f1e728a749950a78f837ac538c73.tar.gz chromium_src-14e66abe9c27f1e728a749950a78f837ac538c73.tar.bz2 | |
This broke M20 build.
Revert 137824 - Properly handle accounts that don't have GMail account.
1. Me2MeHostAuthenticatorFactory now verifies that the bare
JID of the remote client matches bare JID of the host.
Previously it was comparing it with the user's email,
which may be different from JID.
2. GaiaOAuthClient now fetches user's email.
3. SignalingConnector verifies that user's email matches
the expected value stored in xmpp_login. If it doesn't,
then the auth token was generated for a different account
and the host treats it as an authentication error.
BUG=128102
Review URL: https://chromiumcodereview.appspot.com/10332187
TBR=sergeyu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10388226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/remoting_me2me_host.cc')
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 806701d..0e06970 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -190,7 +190,7 @@ class HostProcess void CreateAuthenticatorFactory() { scoped_ptr<protocol::AuthenticatorFactory> factory( new protocol::Me2MeHostAuthenticatorFactory( - key_pair_.GenerateCertificate(), + xmpp_login_, key_pair_.GenerateCertificate(), *key_pair_.private_key(), host_secret_hash_)); host_->SetAuthenticatorFactory(factory.Pass()); } |