Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: net/quic/crypto/quic_crypto_client_config.cc

Issue 342863005: QUIC - Record reject reasons for CHLO message. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added COMPILE_ASSERT Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/crypto/quic_crypto_client_config.h" 5 #include "net/quic/crypto/quic_crypto_client_config.h"
6 6
7 #include "base/metrics/sparse_histogram.h"
7 #include "base/stl_util.h" 8 #include "base/stl_util.h"
8 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
9 #include "net/quic/crypto/cert_compressor.h" 10 #include "net/quic/crypto/cert_compressor.h"
10 #include "net/quic/crypto/chacha20_poly1305_encrypter.h" 11 #include "net/quic/crypto/chacha20_poly1305_encrypter.h"
11 #include "net/quic/crypto/channel_id.h" 12 #include "net/quic/crypto/channel_id.h"
12 #include "net/quic/crypto/common_cert_set.h" 13 #include "net/quic/crypto/common_cert_set.h"
13 #include "net/quic/crypto/crypto_framer.h" 14 #include "net/quic/crypto/crypto_framer.h"
14 #include "net/quic/crypto/crypto_utils.h" 15 #include "net/quic/crypto/crypto_utils.h"
15 #include "net/quic/crypto/curve25519_key_exchange.h" 16 #include "net/quic/crypto/curve25519_key_exchange.h"
16 #include "net/quic/crypto/key_exchange.h" 17 #include "net/quic/crypto/key_exchange.h"
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 *error_details = "Proof missing"; 586 *error_details = "Proof missing";
586 return QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER; 587 return QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER;
587 } 588 }
588 } 589 }
589 590
590 const uint32* reject_reasons; 591 const uint32* reject_reasons;
591 size_t num_reject_reasons; 592 size_t num_reject_reasons;
592 COMPILE_ASSERT(sizeof(QuicTag) == sizeof(uint32), header_out_of_sync); 593 COMPILE_ASSERT(sizeof(QuicTag) == sizeof(uint32), header_out_of_sync);
593 if (rej.GetTaglist(kRREJ, &reject_reasons, 594 if (rej.GetTaglist(kRREJ, &reject_reasons,
594 &num_reject_reasons) == QUIC_NO_ERROR) { 595 &num_reject_reasons) == QUIC_NO_ERROR) {
595 #if defined(DEBUG) 596 uint32 packed_error = 0;
596 for (size_t i = 0; i < num_reject_reasons; ++i) { 597 for (size_t i = 0; i < num_reject_reasons; ++i) {
597 DVLOG(1) << "Reasons for rejection: " << reject_reasons[i]; 598 HandshakeFailureReason reason =
599 static_cast<HandshakeFailureReason>(reject_reasons[i]);
600 packed_error |= RejectReasonToPackedError(reason);
Alexei Svitkine (slow) 2014/06/23 18:33:08 Why this complicated scheme instead of logging |re
ramant (doing other things) 2014/06/23 18:40:11 Correct.
598 } 601 }
599 #endif 602 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.QuicClientHelloRejectReasons",
603 packed_error);
600 } 604 }
601 605
602 return QUIC_NO_ERROR; 606 return QUIC_NO_ERROR;
603 } 607 }
604 608
609 uint32 QuicCryptoClientConfig::RejectReasonToPackedError(
610 HandshakeFailureReason reason) {
Alexei Svitkine (slow) 2014/06/23 20:06:10 It's very confusing that this enum has the same na
ramant (doing other things) 2014/06/23 22:08:03 Thanks. Will make that change in the internal code
611 enum RejectReasonShift {
612 CLIENT_NONCE_SHIFT = 5,
Alexei Svitkine (slow) 2014/06/23 20:06:10 TBH, I don't think this is very easy to follow. I
ramant (doing other things) 2014/06/23 22:08:03 Defined the mapping. Is this what you have in mind
613 SERVER_NONCE_SHIFT = 10,
614 SERVER_CONFIG_SHIFT = 15,
615 SOURCE_ADDRESS_TOKEN_SHIFT = 20,
616 };
617 COMPILE_ASSERT(CLIENT_NONCE_INVALID_FAILURE - CLIENT_NONCE_UNKNOWN_FAILURE <
618 CLIENT_NONCE_SHIFT, client_nonce_failure_reasons_too_big);
619 COMPILE_ASSERT(SERVER_NONCE_NOT_UNIQUE_FAILURE -
620 SERVER_NONCE_INVALID_FAILURE < SERVER_NONCE_SHIFT,
621 server_nonce_failure_reasons_too_big);
622 COMPILE_ASSERT(SERVER_CONFIG_UNKNOWN_CONFIG_FAILURE -
623 SERVER_CONFIG_INCHOATE_HELLO_FAILURE < SERVER_CONFIG_SHIFT,
624 server_config_failure_reasons_too_big);
625 COMPILE_ASSERT(SOURCE_ADDRESS_TOKEN_EXPIRED_FAILURE -
626 SOURCE_ADDRESS_TOKEN_INVALID_FAILURE <
627 SOURCE_ADDRESS_TOKEN_SHIFT,
628 source_address_token_failure_reasons_too_big);
629
630 if (reason < CLIENT_NONCE_UNKNOWN_FAILURE) {
631 return reason;
632 }
633 if (reason < SERVER_NONCE_INVALID_FAILURE) {
634 return (reason - CLIENT_NONCE_UNKNOWN_FAILURE + 1) << CLIENT_NONCE_SHIFT;
635 }
636 if (reason < SERVER_CONFIG_INCHOATE_HELLO_FAILURE) {
637 return (reason - SERVER_NONCE_INVALID_FAILURE + 1) << SERVER_NONCE_SHIFT;
638 }
639 if (reason < SOURCE_ADDRESS_TOKEN_INVALID_FAILURE) {
640 return (reason - SERVER_CONFIG_INCHOATE_HELLO_FAILURE + 1) <<
641 SERVER_CONFIG_SHIFT;
642 }
643 return (reason - SOURCE_ADDRESS_TOKEN_INVALID_FAILURE + 1) <<
644 SOURCE_ADDRESS_TOKEN_SHIFT;
645 }
646
605 QuicErrorCode QuicCryptoClientConfig::ProcessServerHello( 647 QuicErrorCode QuicCryptoClientConfig::ProcessServerHello(
606 const CryptoHandshakeMessage& server_hello, 648 const CryptoHandshakeMessage& server_hello,
607 QuicConnectionId connection_id, 649 QuicConnectionId connection_id,
608 const QuicVersionVector& negotiated_versions, 650 const QuicVersionVector& negotiated_versions,
609 CachedState* cached, 651 CachedState* cached,
610 QuicCryptoNegotiatedParameters* out_params, 652 QuicCryptoNegotiatedParameters* out_params,
611 string* error_details) { 653 string* error_details) {
612 DCHECK(error_details != NULL); 654 DCHECK(error_details != NULL);
613 655
614 if (server_hello.tag() != kSHLO) { 656 if (server_hello.tag() != kSHLO) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 return; 798 return;
757 } 799 }
758 800
759 // Update canonical version to point at the "most recent" entry. 801 // Update canonical version to point at the "most recent" entry.
760 canonical_server_map_[suffix_server_id] = server_id; 802 canonical_server_map_[suffix_server_id] = server_id;
761 803
762 server_state->InitializeFrom(*canonical_state); 804 server_state->InitializeFrom(*canonical_state);
763 } 805 }
764 806
765 } // namespace net 807 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/quic_crypto_client_config.h ('k') | net/quic/crypto/quic_crypto_client_config_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698