| Index: net/quic/quic_crypto_client_stream_test.cc
|
| diff --git a/net/quic/quic_crypto_client_stream_test.cc b/net/quic/quic_crypto_client_stream_test.cc
|
| deleted file mode 100644
|
| index 3c6b91b10f2158b52c98e37489cdc2366d8ced56..0000000000000000000000000000000000000000
|
| --- a/net/quic/quic_crypto_client_stream_test.cc
|
| +++ /dev/null
|
| @@ -1,363 +0,0 @@
|
| -// 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 "net/quic/quic_crypto_client_stream.h"
|
| -
|
| -#include <memory>
|
| -
|
| -#include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
|
| -#include "net/quic/crypto/quic_decrypter.h"
|
| -#include "net/quic/crypto/quic_encrypter.h"
|
| -#include "net/quic/quic_flags.h"
|
| -#include "net/quic/quic_protocol.h"
|
| -#include "net/quic/quic_server_id.h"
|
| -#include "net/quic/quic_utils.h"
|
| -#include "net/quic/test_tools/crypto_test_utils.h"
|
| -#include "net/quic/test_tools/quic_test_utils.h"
|
| -#include "net/quic/test_tools/simple_quic_framer.h"
|
| -#include "testing/gmock/include/gmock/gmock.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -
|
| -using std::string;
|
| -using std::vector;
|
| -
|
| -using testing::_;
|
| -
|
| -namespace net {
|
| -namespace test {
|
| -namespace {
|
| -
|
| -const char kServerHostname[] = "test.example.com";
|
| -const uint16_t kServerPort = 443;
|
| -
|
| -class QuicCryptoClientStreamTest : public ::testing::Test {
|
| - public:
|
| - QuicCryptoClientStreamTest()
|
| - : server_id_(kServerHostname, kServerPort, PRIVACY_MODE_DISABLED),
|
| - crypto_config_(CryptoTestUtils::ProofVerifierForTesting()) {
|
| - CreateConnection();
|
| - }
|
| -
|
| - void CreateConnection() {
|
| - connection_ = new PacketSavingConnection(&helper_, &alarm_factory_,
|
| - Perspective::IS_CLIENT);
|
| - // Advance the time, because timers do not like uninitialized times.
|
| - connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1));
|
| -
|
| - session_.reset(new TestQuicSpdyClientSession(
|
| - connection_, DefaultQuicConfig(), server_id_, &crypto_config_));
|
| - }
|
| -
|
| - void CompleteCryptoHandshake() {
|
| - stream()->CryptoConnect();
|
| - QuicConfig config;
|
| - CryptoTestUtils::HandshakeWithFakeServer(&config, &helper_, &alarm_factory_,
|
| - connection_, stream(),
|
| - server_options_);
|
| - }
|
| -
|
| - void ConstructHandshakeMessage() {
|
| - CryptoFramer framer;
|
| - message_data_.reset(framer.ConstructHandshakeMessage(message_));
|
| - }
|
| -
|
| - QuicCryptoClientStream* stream() { return session_->GetCryptoStream(); }
|
| -
|
| - MockQuicConnectionHelper helper_;
|
| - MockAlarmFactory alarm_factory_;
|
| - PacketSavingConnection* connection_;
|
| - std::unique_ptr<TestQuicSpdyClientSession> session_;
|
| - QuicServerId server_id_;
|
| - CryptoHandshakeMessage message_;
|
| - std::unique_ptr<QuicData> message_data_;
|
| - QuicCryptoClientConfig crypto_config_;
|
| - CryptoTestUtils::FakeServerOptions server_options_;
|
| -};
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, NotInitiallyConected) {
|
| - EXPECT_FALSE(stream()->encryption_established());
|
| - EXPECT_FALSE(stream()->handshake_confirmed());
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, ConnectedAfterSHLO) {
|
| - CompleteCryptoHandshake();
|
| - EXPECT_TRUE(stream()->encryption_established());
|
| - EXPECT_TRUE(stream()->handshake_confirmed());
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, MessageAfterHandshake) {
|
| - CompleteCryptoHandshake();
|
| -
|
| - EXPECT_CALL(
|
| - *connection_,
|
| - CloseConnection(QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE, _, _));
|
| - message_.set_tag(kCHLO);
|
| - ConstructHandshakeMessage();
|
| - stream()->OnStreamFrame(QuicStreamFrame(kCryptoStreamId, /*fin=*/false,
|
| - /*offset=*/0,
|
| - message_data_->AsStringPiece()));
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, BadMessageType) {
|
| - stream()->CryptoConnect();
|
| -
|
| - message_.set_tag(kCHLO);
|
| - ConstructHandshakeMessage();
|
| -
|
| - EXPECT_CALL(*connection_, CloseConnection(QUIC_INVALID_CRYPTO_MESSAGE_TYPE,
|
| - "Expected REJ", _));
|
| - stream()->OnStreamFrame(QuicStreamFrame(kCryptoStreamId, /*fin=*/false,
|
| - /*offset=*/0,
|
| - message_data_->AsStringPiece()));
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, NegotiatedParameters) {
|
| - CompleteCryptoHandshake();
|
| -
|
| - const QuicConfig* config = session_->config();
|
| - EXPECT_EQ(kMaximumIdleTimeoutSecs,
|
| - config->IdleConnectionStateLifetime().ToSeconds());
|
| - EXPECT_EQ(kDefaultMaxStreamsPerConnection, config->MaxStreamsPerConnection());
|
| -
|
| - const QuicCryptoNegotiatedParameters& crypto_params(
|
| - stream()->crypto_negotiated_params());
|
| - EXPECT_EQ(crypto_config_.aead[0], crypto_params.aead);
|
| - EXPECT_EQ(crypto_config_.kexs[0], crypto_params.key_exchange);
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, ExpiredServerConfig) {
|
| - // Seed the config with a cached server config.
|
| - CompleteCryptoHandshake();
|
| -
|
| - // Recreate connection with the new config.
|
| - CreateConnection();
|
| -
|
| - // Advance time 5 years to ensure that we pass the expiry time of the cached
|
| - // server config.
|
| - connection_->AdvanceTime(
|
| - QuicTime::Delta::FromSeconds(60 * 60 * 24 * 365 * 5));
|
| -
|
| - stream()->CryptoConnect();
|
| - // Check that a client hello was sent.
|
| - ASSERT_EQ(1u, connection_->encrypted_packets_.size());
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, InvalidCachedServerConfig) {
|
| - // Seed the config with a cached server config.
|
| - CompleteCryptoHandshake();
|
| -
|
| - // Recreate connection with the new config.
|
| - CreateConnection();
|
| -
|
| - QuicCryptoClientConfig::CachedState* state =
|
| - crypto_config_.LookupOrCreate(server_id_);
|
| -
|
| - vector<string> certs = state->certs();
|
| - string cert_sct = state->cert_sct();
|
| - string signature = state->signature();
|
| - string chlo_hash = state->chlo_hash();
|
| - state->SetProof(certs, cert_sct, chlo_hash, signature + signature);
|
| -
|
| - stream()->CryptoConnect();
|
| - // Check that a client hello was sent.
|
| - ASSERT_EQ(1u, connection_->encrypted_packets_.size());
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, ServerConfigUpdate) {
|
| - // Test that the crypto client stream can receive server config updates after
|
| - // the connection has been established.
|
| - CompleteCryptoHandshake();
|
| -
|
| - QuicCryptoClientConfig::CachedState* state =
|
| - crypto_config_.LookupOrCreate(server_id_);
|
| -
|
| - // Ensure cached STK is different to what we send in the handshake.
|
| - EXPECT_NE("xstk", state->source_address_token());
|
| -
|
| - // Initialize using {...} syntax to avoid trailing \0 if converting from
|
| - // string.
|
| - unsigned char stk[] = {'x', 's', 't', 'k'};
|
| -
|
| - // Minimum SCFG that passes config validation checks.
|
| - unsigned char scfg[] = {// SCFG
|
| - 0x53, 0x43, 0x46, 0x47,
|
| - // num entries
|
| - 0x01, 0x00,
|
| - // padding
|
| - 0x00, 0x00,
|
| - // EXPY
|
| - 0x45, 0x58, 0x50, 0x59,
|
| - // EXPY end offset
|
| - 0x08, 0x00, 0x00, 0x00,
|
| - // Value
|
| - '1', '2', '3', '4', '5', '6', '7', '8'};
|
| -
|
| - CryptoHandshakeMessage server_config_update;
|
| - server_config_update.set_tag(kSCUP);
|
| - server_config_update.SetValue(kSourceAddressTokenTag, stk);
|
| - server_config_update.SetValue(kSCFG, scfg);
|
| -
|
| - std::unique_ptr<QuicData> data(
|
| - CryptoFramer::ConstructHandshakeMessage(server_config_update));
|
| - stream()->OnStreamFrame(QuicStreamFrame(kCryptoStreamId, /*fin=*/false,
|
| - /*offset=*/0, data->AsStringPiece()));
|
| -
|
| - // Make sure that the STK and SCFG are cached correctly.
|
| - EXPECT_EQ("xstk", state->source_address_token());
|
| -
|
| - string cached_scfg = state->server_config();
|
| - test::CompareCharArraysWithHexError(
|
| - "scfg", cached_scfg.data(), cached_scfg.length(),
|
| - QuicUtils::AsChars(scfg), arraysize(scfg));
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, ServerConfigUpdateBeforeHandshake) {
|
| - EXPECT_CALL(
|
| - *connection_,
|
| - CloseConnection(QUIC_CRYPTO_UPDATE_BEFORE_HANDSHAKE_COMPLETE, _, _));
|
| - CryptoHandshakeMessage server_config_update;
|
| - server_config_update.set_tag(kSCUP);
|
| - std::unique_ptr<QuicData> data(
|
| - CryptoFramer::ConstructHandshakeMessage(server_config_update));
|
| - stream()->OnStreamFrame(QuicStreamFrame(kCryptoStreamId, /*fin=*/false,
|
| - /*offset=*/0, data->AsStringPiece()));
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, TokenBindingNegotiation) {
|
| - server_options_.token_binding_enabled = true;
|
| - crypto_config_.tb_key_params.push_back(kP256);
|
| -
|
| - CompleteCryptoHandshake();
|
| - EXPECT_TRUE(stream()->encryption_established());
|
| - EXPECT_TRUE(stream()->handshake_confirmed());
|
| - EXPECT_EQ(kP256,
|
| - stream()->crypto_negotiated_params().token_binding_key_param);
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, NoTokenBindingWithoutServerSupport) {
|
| - crypto_config_.tb_key_params.push_back(kP256);
|
| -
|
| - CompleteCryptoHandshake();
|
| - EXPECT_TRUE(stream()->encryption_established());
|
| - EXPECT_TRUE(stream()->handshake_confirmed());
|
| - EXPECT_EQ(0u, stream()->crypto_negotiated_params().token_binding_key_param);
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, NoTokenBindingWithoutClientSupport) {
|
| - server_options_.token_binding_enabled = true;
|
| -
|
| - CompleteCryptoHandshake();
|
| - EXPECT_TRUE(stream()->encryption_established());
|
| - EXPECT_TRUE(stream()->handshake_confirmed());
|
| - EXPECT_EQ(0u, stream()->crypto_negotiated_params().token_binding_key_param);
|
| -}
|
| -
|
| -TEST_F(QuicCryptoClientStreamTest, TokenBindingNotNegotiated) {
|
| - CompleteCryptoHandshake();
|
| - EXPECT_TRUE(stream()->encryption_established());
|
| - EXPECT_TRUE(stream()->handshake_confirmed());
|
| - EXPECT_EQ(0u, stream()->crypto_negotiated_params().token_binding_key_param);
|
| -}
|
| -
|
| -class QuicCryptoClientStreamStatelessTest : public ::testing::Test {
|
| - public:
|
| - QuicCryptoClientStreamStatelessTest()
|
| - : client_crypto_config_(CryptoTestUtils::ProofVerifierForTesting()),
|
| - server_crypto_config_(QuicCryptoServerConfig::TESTING,
|
| - QuicRandom::GetInstance(),
|
| - CryptoTestUtils::ProofSourceForTesting()),
|
| - server_compressed_certs_cache_(
|
| - QuicCompressedCertsCache::kQuicCompressedCertsCacheSize),
|
| - server_id_(kServerHostname, kServerPort, PRIVACY_MODE_DISABLED) {
|
| - TestQuicSpdyClientSession* client_session = nullptr;
|
| - CreateClientSessionForTest(server_id_,
|
| - /* supports_stateless_rejects= */ true,
|
| - QuicTime::Delta::FromSeconds(100000),
|
| - QuicSupportedVersions(), &helper_,
|
| - &alarm_factory_, &client_crypto_config_,
|
| - &client_connection_, &client_session);
|
| - CHECK(client_session);
|
| - client_session_.reset(client_session);
|
| - }
|
| -
|
| - QuicCryptoServerStream* server_stream() {
|
| - return server_session_->GetCryptoStream();
|
| - }
|
| -
|
| - void AdvanceHandshakeWithFakeServer() {
|
| - client_session_->GetCryptoStream()->CryptoConnect();
|
| - CryptoTestUtils::AdvanceHandshake(client_connection_,
|
| - client_session_->GetCryptoStream(), 0,
|
| - server_connection_, server_stream(), 0);
|
| - }
|
| -
|
| - // Initializes the server_stream_ for stateless rejects.
|
| - void InitializeFakeStatelessRejectServer() {
|
| - TestQuicSpdyServerSession* server_session = nullptr;
|
| - CreateServerSessionForTest(server_id_, QuicTime::Delta::FromSeconds(100000),
|
| - QuicSupportedVersions(), &helper_,
|
| - &alarm_factory_, &server_crypto_config_,
|
| - &server_compressed_certs_cache_,
|
| - &server_connection_, &server_session);
|
| - CHECK(server_session);
|
| - server_session_.reset(server_session);
|
| - CryptoTestUtils::FakeServerOptions options;
|
| - CryptoTestUtils::SetupCryptoServerConfigForTest(
|
| - server_connection_->clock(), server_connection_->random_generator(),
|
| - server_session_->config(), &server_crypto_config_, options);
|
| - FLAGS_enable_quic_stateless_reject_support = true;
|
| - }
|
| -
|
| - MockQuicConnectionHelper helper_;
|
| - MockAlarmFactory alarm_factory_;
|
| -
|
| - // Client crypto stream state
|
| - PacketSavingConnection* client_connection_;
|
| - std::unique_ptr<TestQuicSpdyClientSession> client_session_;
|
| - QuicCryptoClientConfig client_crypto_config_;
|
| -
|
| - // Server crypto stream state
|
| - PacketSavingConnection* server_connection_;
|
| - std::unique_ptr<TestQuicSpdyServerSession> server_session_;
|
| - QuicCryptoServerConfig server_crypto_config_;
|
| - QuicCompressedCertsCache server_compressed_certs_cache_;
|
| - QuicServerId server_id_;
|
| -};
|
| -
|
| -TEST_F(QuicCryptoClientStreamStatelessTest, StatelessReject) {
|
| - ValueRestore<bool> old_flag(&FLAGS_enable_quic_stateless_reject_support,
|
| - true);
|
| -
|
| - QuicCryptoClientConfig::CachedState* client_state =
|
| - client_crypto_config_.LookupOrCreate(server_id_);
|
| -
|
| - EXPECT_FALSE(client_state->has_server_designated_connection_id());
|
| - EXPECT_CALL(*client_session_, OnProofValid(testing::_));
|
| -
|
| - InitializeFakeStatelessRejectServer();
|
| - AdvanceHandshakeWithFakeServer();
|
| -
|
| - EXPECT_EQ(1, server_stream()->NumHandshakeMessages());
|
| - EXPECT_EQ(0, server_stream()->NumHandshakeMessagesWithServerNonces());
|
| -
|
| - EXPECT_FALSE(client_session_->GetCryptoStream()->encryption_established());
|
| - EXPECT_FALSE(client_session_->GetCryptoStream()->handshake_confirmed());
|
| - // Even though the handshake was not complete, the cached client_state is
|
| - // complete, and can be used for a subsequent successful handshake.
|
| - EXPECT_TRUE(client_state->IsComplete(QuicWallTime::FromUNIXSeconds(0)));
|
| -
|
| - ASSERT_TRUE(client_state->has_server_nonce());
|
| - ASSERT_FALSE(client_state->GetNextServerNonce().empty());
|
| - ASSERT_TRUE(client_state->has_server_designated_connection_id());
|
| - QuicConnectionId server_designated_id =
|
| - client_state->GetNextServerDesignatedConnectionId();
|
| - QuicConnectionId expected_id =
|
| - server_session_->connection()->random_generator()->RandUint64();
|
| - EXPECT_EQ(expected_id, server_designated_id);
|
| - EXPECT_FALSE(client_state->has_server_designated_connection_id());
|
| -}
|
| -
|
| -} // namespace
|
| -} // namespace test
|
| -} // namespace net
|
|
|