diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:19:59 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:19:59 +0000 |
commit | 1f249e24c736c7e8a330567b1403d8893f57ea49 (patch) | |
tree | 6feaa0669f1d1f0f2c6071a4cb66ee799015db46 /remoting/protocol/jingle_session_unittest.cc | |
parent | 72851a9a7d4f40ae41d26ac1a94f02544ac495be (diff) | |
download | chromium_src-1f249e24c736c7e8a330567b1403d8893f57ea49.zip chromium_src-1f249e24c736c7e8a330567b1403d8893f57ea49.tar.gz chromium_src-1f249e24c736c7e8a330567b1403d8893f57ea49.tar.bz2 |
Remove AccessVerifier interface.
AccessVerifier will be replaced with the new
protocol::Authenticator interface. This also changes behavior
of Session interface when session is rejected due to bad
auth: now the session is first accepted by ChromotingHost
but then goes to FAILED state with the new
AUTHENTICATION_FAILED error. Temporarily auth token is
verified in JingleSession::AcceptConnection(). Later
Authenticator implementation will be used instead.
BUG=105214
Review URL: http://codereview.chromium.org/8662001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session_unittest.cc')
-rw-r--r-- | remoting/protocol/jingle_session_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc index 7ac4c3a..4b91b13 100644 --- a/remoting/protocol/jingle_session_unittest.cc +++ b/remoting/protocol/jingle_session_unittest.cc @@ -15,6 +15,7 @@ #include "net/base/net_errors.h" #include "net/socket/socket.h" #include "net/socket/stream_socket.h" +#include "remoting/protocol/auth_util.h" #include "remoting/protocol/jingle_session.h" #include "remoting/protocol/jingle_session_manager.h" #include "remoting/jingle_glue/jingle_thread.h" @@ -54,7 +55,6 @@ const int kMessageSize = 1024; const int kMessages = 100; const int kTestDataSize = kMessages * kMessageSize; const int kUdpWriteDelayMs = 10; -const char kTestToken[] = "a_dummy_token"; const char kChannelName[] = "test_channel"; const char kHostJid[] = "host1@gmail.com/123"; @@ -244,7 +244,8 @@ class JingleSessionTest : public testing::Test { } client_session_.reset(client_server_->Connect( - kHostJid, kTestHostPublicKey, kTestToken, + kHostJid, kTestHostPublicKey, + GenerateSupportAuthToken(kClientJid, kTestSharedSecret), CandidateSessionConfig::CreateDefault(), base::Bind(&MockSessionCallback::OnStateChange, base::Unretained(&client_connection_callback_)))); @@ -669,7 +670,8 @@ TEST_F(JingleSessionTest, RejectConnection) { } client_session_.reset(client_server_->Connect( - kHostJid, kTestHostPublicKey, kTestToken, + kHostJid, kTestHostPublicKey, + GenerateSupportAuthToken(kClientJid, kTestSharedSecret), CandidateSessionConfig::CreateDefault(), base::Bind(&MockSessionCallback::OnStateChange, base::Unretained(&client_connection_callback_)))); |