Support IETF RETRY from client
This CL parses the retry token, and updates our connection ID and crypters. Server-side support will come in a subsequent CL which will also add end to end tests.
gfe-relnote: Support IETF Retry packets from client in v99, protected by disabled v99 flag
PiperOrigin-RevId: 246911895
Change-Id: Icd5ecd22190fd18ad42882a66c3aa470640ce223
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 303dca2..55208e9 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -1510,6 +1510,8 @@
if (IsVersionNegotiation(header, packet_has_ietf_packet_header)) {
QUIC_DVLOG(1) << ENDPOINT << "Received version negotiation packet";
rv = ProcessVersionNegotiationPacket(&reader, header);
+ } else if (header.long_packet_type == RETRY) {
+ rv = ProcessRetryPacket(&reader, header);
} else if (header.reset_flag) {
rv = ProcessPublicResetPacket(&reader, header);
} else if (packet.length() <= kMaxIncomingPacketSize) {
@@ -1563,6 +1565,29 @@
return true;
}
+bool QuicFramer::ProcessRetryPacket(QuicDataReader* reader,
+ const QuicPacketHeader& header) {
+ DCHECK_EQ(Perspective::IS_CLIENT, perspective_);
+
+ // Parse Original Destination Connection ID Length.
+ uint8_t odcil = header.type_byte & 0xf;
+ if (odcil != 0) {
+ odcil += kConnectionIdLengthAdjustment;
+ }
+
+ // Parse Original Destination Connection ID.
+ QuicConnectionId original_destination_connection_id;
+ if (!reader->ReadConnectionId(&original_destination_connection_id, odcil)) {
+ set_detailed_error("Unable to read Original Destination ConnectionId.");
+ return false;
+ }
+
+ QuicStringPiece retry_token = reader->ReadRemainingPayload();
+ visitor_->OnRetryPacket(original_destination_connection_id,
+ header.source_connection_id, retry_token);
+ return true;
+}
+
bool QuicFramer::MaybeProcessIetfInitialRetryToken(
QuicDataReader* encrypted_reader,
QuicPacketHeader* header) {
@@ -2430,6 +2455,7 @@
set_detailed_error("Unable to read type.");
return false;
}
+ header->type_byte = type;
// Determine whether this is a long or short header.
header->form = type & FLAGS_LONG_HEADER ? IETF_QUIC_LONG_HEADER_PACKET
: IETF_QUIC_SHORT_HEADER_PACKET;
@@ -2469,14 +2495,19 @@
set_detailed_error("Illegal long header type value.");
return false;
}
- if (header->long_packet_type == RETRY &&
- (version().KnowsWhichDecrypterToUse() ||
- supports_multiple_packet_number_spaces_)) {
- set_detailed_error("Not yet supported IETF RETRY packet received.");
- return RaiseError(QUIC_INVALID_PACKET_HEADER);
+ if (header->long_packet_type == RETRY) {
+ if (!version().SupportsRetry()) {
+ set_detailed_error("RETRY not supported in this version.");
+ return false;
+ }
+ if (perspective_ == Perspective::IS_SERVER) {
+ set_detailed_error("Client-initiated RETRY is invalid.");
+ return false;
+ }
+ } else {
+ header->packet_number_length = GetLongHeaderPacketNumberLength(
+ header->version.transport_version, type);
}
- header->packet_number_length = GetLongHeaderPacketNumberLength(
- header->version.transport_version, type);
}
}
if (header->long_packet_type != VERSION_NEGOTIATION) {
