Chromium Code Reviews| Index: extensions/browser/api/cast_channel/cast_socket_unittest.cc |
| diff --git a/extensions/browser/api/cast_channel/cast_socket_unittest.cc b/extensions/browser/api/cast_channel/cast_socket_unittest.cc |
| index 08b18acf01a56c27b35bf7c3d68164d83f4ea61d..56c8033eca81e10b39738978967f8fd9c8e54575 100644 |
| --- a/extensions/browser/api/cast_channel/cast_socket_unittest.cc |
| +++ b/extensions/browser/api/cast_channel/cast_socket_unittest.cc |
| @@ -9,6 +9,7 @@ |
| #include <utility> |
| #include <vector> |
| +#include "base/files/file_util.h" |
| #include "base/location.h" |
| #include "base/macros.h" |
| #include "base/memory/ptr_util.h" |
| @@ -21,6 +22,8 @@ |
| #include "base/test/simple_test_clock.h" |
| #include "base/threading/thread_task_runner_handle.h" |
| #include "base/timer/mock_timer.h" |
| +#include "content/public/test/test_browser_thread_bundle.h" |
| +#include "crypto/rsa_private_key.h" |
| #include "extensions/browser/api/cast_channel/cast_auth_util.h" |
| #include "extensions/browser/api/cast_channel/cast_framer.h" |
| #include "extensions/browser/api/cast_channel/cast_message_util.h" |
| @@ -30,11 +33,15 @@ |
| #include "extensions/common/api/cast_channel/cast_channel.pb.h" |
| #include "net/base/address_list.h" |
| #include "net/base/net_errors.h" |
| +#include "net/cert/pem_tokenizer.h" |
| #include "net/log/test_net_log.h" |
| #include "net/socket/socket_test_util.h" |
| #include "net/socket/ssl_client_socket.h" |
| +#include "net/socket/ssl_server_socket.h" |
| #include "net/socket/tcp_client_socket.h" |
| +#include "net/socket/tcp_server_socket.h" |
| #include "net/ssl/ssl_info.h" |
| +#include "net/ssl/ssl_server_config.h" |
| #include "net/test/cert_test_util.h" |
| #include "net/test/test_data_directory.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| @@ -222,7 +229,9 @@ class TestCastSocket : public CastSocketImpl { |
| verify_challenge_disallow_(false), |
| tcp_unresponsive_(false), |
| mock_timer_(new base::MockTimer(false, false)), |
| - mock_transport_(nullptr) {} |
| + mock_transport_(nullptr), |
| + tcp_client_socket_(nullptr), |
| + use_tcp_socket_(false) {} |
|
mark a. foltz
2016/07/02 01:44:55
This looks like it could be removed and replaced w
btolsch
2016/07/13 02:59:49
The boolean has been removed by splitting the test
|
| ~TestCastSocket() override {} |
| @@ -231,6 +240,11 @@ class TestCastSocket : public CastSocketImpl { |
| SetTransportForTesting(base::WrapUnique(mock_transport_)); |
| } |
| + void SetTcpSocket(std::unique_ptr<net::TCPClientSocket> tcp_client_socket) { |
| + tcp_client_socket_ = std::move(tcp_client_socket); |
| + use_tcp_socket_ = true; |
| + } |
| + |
| // Socket connection helpers. |
| void SetupTcpConnect(net::IoMode mode, int result) { |
| tcp_connect_data_.reset(new net::MockConnect(mode, result)); |
| @@ -296,6 +310,8 @@ class TestCastSocket : public CastSocketImpl { |
| std::unique_ptr<net::TCPClientSocket> CreateTcpSocket() override { |
| if (tcp_unresponsive_) { |
| return std::unique_ptr<net::TCPClientSocket>(new MockTCPSocket(true)); |
| + } else if (tcp_client_socket_) { |
| + return std::move(tcp_client_socket_); |
| } else { |
| net::MockConnect* connect_data = tcp_connect_data_.get(); |
| connect_data->peer_addr = ip_; |
| @@ -306,6 +322,9 @@ class TestCastSocket : public CastSocketImpl { |
| std::unique_ptr<net::SSLClientSocket> CreateSslSocket( |
| std::unique_ptr<net::StreamSocket> socket) override { |
| + if (use_tcp_socket_) { |
| + return CastSocketImpl::CreateSslSocket(std::move(socket)); |
| + } |
| net::MockConnect* connect_data = ssl_connect_data_.get(); |
| connect_data->peer_addr = ip_; |
| @@ -350,13 +369,21 @@ class TestCastSocket : public CastSocketImpl { |
| std::unique_ptr<base::MockTimer> mock_timer_; |
| MockCastTransport* mock_transport_; |
| + // A real TCP socket that is used instead of the mocks when testing with the |
| + // real SSL implementation. When this is set, CreateTcpSocket() will use this |
| + // as the underlying transport and CreateSslSocket() will call the base |
| + // implementation in CastSocketImpl. |
| + std::unique_ptr<net::TCPClientSocket> tcp_client_socket_; |
| + bool use_tcp_socket_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(TestCastSocket); |
| }; |
| class CastSocketTest : public testing::Test { |
| public: |
| CastSocketTest() |
| - : logger_( |
| + : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), |
| + logger_( |
| new Logger(base::WrapUnique<base::Clock>(new base::SimpleTestClock), |
| base::Time())), |
| delegate_(new MockDelegate) {} |
| @@ -378,6 +405,72 @@ class CastSocketTest : public testing::Test { |
| socket_ = TestCastSocket::CreateSecure(logger_); |
| } |
| + // Initializes the SSLServerSocket |server_socket_| and the TCP socket |
| + // |tcp_client_socket_| to be used by the CastSocket |socket_| as transport |
| + // to |server_socket_|. |
| + void CreateSslSockets() { |
| + server_cert_ = |
| + net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem"); |
| + ASSERT_TRUE(server_cert_); |
| + server_private_key_ = ReadTestKeyFromPEM("ok_cert.pem"); |
| + ASSERT_TRUE(server_private_key_); |
| + server_context_ = CreateSSLServerContext( |
| + server_cert_.get(), *server_private_key_, server_ssl_config_); |
| + |
| + tcp_server_socket_.reset( |
| + new net::TCPServerSocket(nullptr, net::NetLog::Source())); |
| + ASSERT_EQ(net::OK, |
| + tcp_server_socket_->ListenWithAddressAndPort("127.0.0.1", 0, 1)); |
| + net::IPEndPoint server_address; |
| + ASSERT_EQ(net::OK, tcp_server_socket_->GetLocalAddress(&server_address)); |
| + tcp_client_socket_.reset( |
| + new net::TCPClientSocket(net::AddressList(server_address), nullptr, |
| + nullptr, net::NetLog::Source())); |
| + |
| + std::unique_ptr<net::StreamSocket> accepted_socket; |
| + ASSERT_EQ( |
| + net::ERR_IO_PENDING, |
| + tcp_server_socket_->Accept( |
| + &accepted_socket, base::Bind(&CastSocketTest::TcpAcceptCallback, |
| + base::Unretained(this)))); |
| + ASSERT_EQ(net::ERR_IO_PENDING, tcp_client_socket_->Connect(base::Bind( |
| + &CastSocketTest::TcpConnectCallback, |
| + base::Unretained(this)))); |
| + RunPendingTasks(); |
| + ASSERT_TRUE(accepted_socket); |
| + ASSERT_TRUE(tcp_client_socket_->IsConnected()); |
| + |
| + server_socket_ = |
| + server_context_->CreateSSLServerSocket(std::move(accepted_socket)); |
| + ASSERT_TRUE(server_socket_); |
| + } |
| + |
| + void TcpAcceptCallback(int result) { ASSERT_EQ(net::OK, result); } |
| + |
| + void TcpConnectCallback(int result) { ASSERT_EQ(net::OK, result); } |
| + |
| + std::unique_ptr<crypto::RSAPrivateKey> ReadTestKeyFromPEM( |
| + const base::StringPiece& name) { |
| + base::FilePath certs_dir(net::GetTestCertsDirectory()); |
| + base::FilePath key_path = certs_dir.AppendASCII(name); |
| + std::vector<std::string> headers; |
| + headers.push_back("PRIVATE KEY"); |
| + std::string pem_data; |
| + if (!base::ReadFileToString(key_path, &pem_data)) { |
| + return nullptr; |
| + } |
| + net::PEMTokenizer pem_tokenizer(pem_data, headers); |
| + if (!pem_tokenizer.GetNext()) { |
| + return nullptr; |
| + } |
| + std::vector<uint8_t> key_vector(pem_tokenizer.data().begin(), |
| + pem_tokenizer.data().end()); |
| + |
| + std::unique_ptr<crypto::RSAPrivateKey> key( |
| + crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector)); |
| + return key; |
| + } |
| + |
| void HandleAuthHandshake() { |
| socket_->SetupMockTransport(); |
| CastMessage challenge_proto = CreateAuthChallenge(); |
| @@ -395,6 +488,36 @@ class CastSocketTest : public testing::Test { |
| RunPendingTasks(); |
| } |
| + int ReadExactLength(net::IOBuffer* buffer, |
| + int buffer_length, |
| + net::Socket* socket) { |
| + scoped_refptr<net::DrainableIOBuffer> draining_buffer( |
| + new net::DrainableIOBuffer(buffer, buffer_length)); |
| + while (draining_buffer->BytesRemaining() > 0) { |
| + net::TestCompletionCallback read_callback; |
| + int read_result = read_callback.GetResult(server_socket_->Read( |
| + draining_buffer.get(), buffer_length, read_callback.callback())); |
| + EXPECT_GT(read_result, 0); |
| + draining_buffer->DidConsume(read_result); |
| + } |
| + return buffer_length; |
| + } |
| + |
| + int WriteExactLength(net::IOBuffer* buffer, |
| + int buffer_length, |
| + net::Socket* socket) { |
| + scoped_refptr<net::DrainableIOBuffer> draining_buffer( |
| + new net::DrainableIOBuffer(buffer, buffer_length)); |
| + while (draining_buffer->BytesRemaining() > 0) { |
| + net::TestCompletionCallback write_callback; |
| + int write_result = write_callback.GetResult(server_socket_->Write( |
| + draining_buffer.get(), buffer_length, write_callback.callback())); |
| + EXPECT_GT(write_result, 0); |
| + draining_buffer->DidConsume(write_result); |
| + } |
| + return buffer_length; |
| + } |
| + |
| protected: |
| // Runs all pending tasks in the message loop. |
| void RunPendingTasks() { |
| @@ -402,12 +525,26 @@ class CastSocketTest : public testing::Test { |
| run_loop.RunUntilIdle(); |
| } |
| - base::MessageLoop message_loop_; |
| + content::TestBrowserThreadBundle thread_bundle_; |
| Logger* logger_; |
| std::unique_ptr<TestCastSocket> socket_; |
| CompleteHandler handler_; |
| std::unique_ptr<MockDelegate> delegate_; |
| + // Underlying TCP sockets for |socket_| to communicate with |server_socket_| |
| + // when testing with the real SSL implementation. |
| + std::unique_ptr<net::TCPClientSocket> tcp_client_socket_; |
| + std::unique_ptr<net::TCPServerSocket> tcp_server_socket_; |
| + |
| + // |server_socket_| is used for the *RealSSL tests in order to test the |
| + // CastSocket over a real SSL socket. The other members below are used to |
| + // initialize |server_socket_|. |
| + std::unique_ptr<net::SSLServerSocket> server_socket_; |
| + std::unique_ptr<net::SSLServerContext> server_context_; |
| + std::unique_ptr<crypto::RSAPrivateKey> server_private_key_; |
| + scoped_refptr<net::X509Certificate> server_cert_; |
| + net::SSLServerConfig server_ssl_config_; |
| + |
| private: |
| DISALLOW_COPY_AND_ASSIGN(CastSocketTest); |
| }; |
| @@ -803,6 +940,132 @@ TEST_F(CastSocketTest, TestConnectChallengeVerificationFails) { |
| socket_->error_state()); |
| } |
| +// Tests connecting through an actual non-mocked CastTransport object and |
| +// non-mocked SSLClientSocket, testing the components in integration. |
| +TEST_F(CastSocketTest, TestConnectEndToEndWithRealSSL) { |
| + CreateCastSocketSecure(); |
| + CreateSslSockets(); |
| + socket_->SetTcpSocket(std::move(tcp_client_socket_)); |
| + |
| + socket_->Connect(std::move(delegate_), |
| + base::Bind(&CompleteHandler::OnConnectComplete, |
| + base::Unretained(&handler_))); |
| + |
| + net::TestCompletionCallback handshake_callback; |
| + int server_ret = handshake_callback.GetResult( |
| + server_socket_->Handshake(handshake_callback.callback())); |
| + |
| + ASSERT_EQ(net::OK, server_ret); |
| + |
| + // Set low-level auth challenge expectations. |
| + CastMessage challenge = CreateAuthChallenge(); |
| + std::string challenge_str; |
| + EXPECT_TRUE(MessageFramer::Serialize(challenge, &challenge_str)); |
| + |
| + int challenge_buffer_length = challenge_str.size(); |
| + scoped_refptr<net::IOBuffer> challenge_buffer( |
| + new net::IOBuffer(challenge_buffer_length)); |
| + int read = ReadExactLength(challenge_buffer.get(), challenge_buffer_length, |
| + server_socket_.get()); |
| + |
| + EXPECT_EQ(challenge_buffer_length, read); |
| + EXPECT_EQ(challenge_str, |
| + std::string(challenge_buffer->data(), challenge_buffer_length)); |
| + |
| + // Set low-level auth reply expectations. |
| + CastMessage reply = CreateAuthReply(); |
| + std::string reply_str; |
| + EXPECT_TRUE(MessageFramer::Serialize(reply, &reply_str)); |
| + |
| + scoped_refptr<net::StringIOBuffer> reply_buffer( |
| + new net::StringIOBuffer(reply_str)); |
| + int written = WriteExactLength(reply_buffer.get(), reply_buffer->size(), |
| + server_socket_.get()); |
| + |
| + EXPECT_EQ(reply_buffer->size(), written); |
| + EXPECT_CALL(handler_, OnConnectComplete(CHANNEL_ERROR_NONE)); |
| + RunPendingTasks(); |
| + |
| + EXPECT_EQ(cast_channel::READY_STATE_OPEN, socket_->ready_state()); |
| + EXPECT_EQ(cast_channel::CHANNEL_ERROR_NONE, socket_->error_state()); |
| +} |
| + |
| +// Sends message data through an actual non-mocked CastTransport object and |
| +// non-mocked SSLClientSocket, testing the components in integration. |
| +TEST_F(CastSocketTest, TestMessageEndToEndWithRealSSL) { |
| + CreateCastSocketSecure(); |
| + CreateSslSockets(); |
| + socket_->SetTcpSocket(std::move(tcp_client_socket_)); |
| + |
| + socket_->Connect(std::move(delegate_), |
| + base::Bind(&CompleteHandler::OnConnectComplete, |
| + base::Unretained(&handler_))); |
| + |
| + net::TestCompletionCallback handshake_callback; |
| + int server_ret = handshake_callback.GetResult( |
| + server_socket_->Handshake(handshake_callback.callback())); |
| + |
| + ASSERT_EQ(net::OK, server_ret); |
| + |
| + // Set low-level auth challenge expectations. |
| + CastMessage challenge = CreateAuthChallenge(); |
| + std::string challenge_str; |
| + EXPECT_TRUE(MessageFramer::Serialize(challenge, &challenge_str)); |
| + |
| + int challenge_buffer_length = challenge_str.size(); |
| + scoped_refptr<net::IOBuffer> challenge_buffer( |
| + new net::IOBuffer(challenge_buffer_length)); |
| + |
| + int read = ReadExactLength(challenge_buffer.get(), challenge_buffer_length, |
| + server_socket_.get()); |
| + |
| + EXPECT_EQ(challenge_buffer_length, read); |
| + EXPECT_EQ(challenge_str, |
| + std::string(challenge_buffer->data(), challenge_buffer_length)); |
| + |
| + // Set low-level auth reply expectations. |
| + CastMessage reply = CreateAuthReply(); |
| + std::string reply_str; |
| + EXPECT_TRUE(MessageFramer::Serialize(reply, &reply_str)); |
| + |
| + scoped_refptr<net::StringIOBuffer> reply_buffer( |
| + new net::StringIOBuffer(reply_str)); |
| + int written = WriteExactLength(reply_buffer.get(), reply_buffer->size(), |
| + server_socket_.get()); |
| + |
| + EXPECT_EQ(reply_buffer->size(), written); |
| + EXPECT_CALL(handler_, OnConnectComplete(CHANNEL_ERROR_NONE)); |
| + RunPendingTasks(); |
| + |
| + EXPECT_EQ(cast_channel::READY_STATE_OPEN, socket_->ready_state()); |
| + EXPECT_EQ(cast_channel::CHANNEL_ERROR_NONE, socket_->error_state()); |
| + |
| + // Send a test message through the ssl socket. |
| + CastMessage test_message = CreateTestMessage(); |
| + std::string test_message_str; |
| + EXPECT_TRUE(MessageFramer::Serialize(test_message, &test_message_str)); |
| + |
| + int test_message_length = test_message_str.size(); |
| + scoped_refptr<net::IOBuffer> test_message_buffer( |
| + new net::IOBuffer(test_message_length)); |
| + |
| + EXPECT_CALL(handler_, OnWriteComplete(net::OK)); |
| + socket_->transport()->SendMessage( |
| + test_message, base::Bind(&CompleteHandler::OnWriteComplete, |
| + base::Unretained(&handler_))); |
| + RunPendingTasks(); |
| + |
| + read = ReadExactLength(test_message_buffer.get(), test_message_length, |
| + server_socket_.get()); |
| + |
| + EXPECT_EQ(test_message_length, read); |
| + EXPECT_EQ(test_message_str, |
| + std::string(test_message_buffer->data(), test_message_length)); |
| + |
| + EXPECT_EQ(cast_channel::READY_STATE_OPEN, socket_->ready_state()); |
| + EXPECT_EQ(cast_channel::CHANNEL_ERROR_NONE, socket_->error_state()); |
| +} |
| + |
| // Sends message data through an actual non-mocked CastTransport object, |
| // testing the two components in integration. |
| TEST_F(CastSocketTest, TestConnectEndToEndWithRealTransportAsync) { |