Remove WebTransport version header check on the server side.
We've decided it is redundant, and removed it from the most recent draft. On the client, we should keep sending it for draft02, but remove it for draft06.
PiperOrigin-RevId: 538185687
diff --git a/quiche/quic/core/http/quic_spdy_session.cc b/quiche/quic/core/http/quic_spdy_session.cc
index 75db1c9..ec1c380 100644
--- a/quiche/quic/core/http/quic_spdy_session.cc
+++ b/quiche/quic/core/http/quic_spdy_session.cc
@@ -872,8 +872,6 @@
bool QuicSpdySession::ShouldNegotiateWebTransport() { return false; }
-bool QuicSpdySession::ShouldValidateWebTransportVersion() const { return true; }
-
bool QuicSpdySession::WillNegotiateWebTransport() {
return LocalHttpDatagramSupport() != HttpDatagramSupport::kNone &&
version().UsesHttp3() && ShouldNegotiateWebTransport();
diff --git a/quiche/quic/core/http/quic_spdy_session.h b/quiche/quic/core/http/quic_spdy_session.h
index 0102787..b2f8b44 100644
--- a/quiche/quic/core/http/quic_spdy_session.h
+++ b/quiche/quic/core/http/quic_spdy_session.h
@@ -454,11 +454,6 @@
QuicSpdyStream* GetOrCreateSpdyDataStream(const QuicStreamId stream_id);
- // Indicates whether the client should check that the
- // `Sec-Webtransport-Http3-Draft` header is valid.
- // TODO(vasilvv): remove this once this is enabled in Chromium.
- virtual bool ShouldValidateWebTransportVersion() const;
-
protected:
// Override CreateIncomingStream(), CreateOutgoingBidirectionalStream() and
// CreateOutgoingUnidirectionalStream() with QuicSpdyStream return type to
diff --git a/quiche/quic/core/http/quic_spdy_session_test.cc b/quiche/quic/core/http/quic_spdy_session_test.cc
index 6c98257..86a22c0 100644
--- a/quiche/quic/core/http/quic_spdy_session_test.cc
+++ b/quiche/quic/core/http/quic_spdy_session_test.cc
@@ -566,7 +566,6 @@
headers.OnHeaderBlockStart();
headers.OnHeader(":method", "CONNECT");
headers.OnHeader(":protocol", "webtransport");
- headers.OnHeader("sec-webtransport-http3-draft02", "1");
stream->OnStreamHeaderList(/*fin=*/true, 0, headers);
WebTransportHttp3* web_transport =
session_.GetWebTransportSession(session_id);
diff --git a/quiche/quic/core/http/quic_spdy_stream.cc b/quiche/quic/core/http/quic_spdy_stream.cc
index a9b8bff..8545703 100644
--- a/quiche/quic/core/http/quic_spdy_stream.cc
+++ b/quiche/quic/core/http/quic_spdy_stream.cc
@@ -1245,14 +1245,6 @@
"Datagram-Flow-Id header";
return;
}
- if (header_name == "sec-webtransport-http3-draft02") {
- if (header_value != "1") {
- QUIC_DLOG(ERROR) << ENDPOINT
- << "Rejecting WebTransport due to invalid value of "
- "Sec-Webtransport-Http3-Draft02 header";
- return;
- }
- }
}
if (method != "CONNECT" || protocol != "webtransport") {
diff --git a/quiche/quic/core/http/quic_spdy_stream_test.cc b/quiche/quic/core/http/quic_spdy_stream_test.cc
index 400eeff..5e78cfb 100644
--- a/quiche/quic/core/http/quic_spdy_stream_test.cc
+++ b/quiche/quic/core/http/quic_spdy_stream_test.cc
@@ -3095,7 +3095,6 @@
headers_[":method"] = "CONNECT";
headers_[":protocol"] = "webtransport";
- headers_["sec-webtransport-http3-draft02"] = "1";
stream_->OnStreamHeadersPriority(
spdy::SpdyStreamPrecedence(kV3HighestPriority));
diff --git a/quiche/quic/core/http/web_transport_http3.cc b/quiche/quic/core/http/web_transport_http3.cc
index 6388e4c..7773de3 100644
--- a/quiche/quic/core/http/web_transport_http3.cc
+++ b/quiche/quic/core/http/web_transport_http3.cc
@@ -179,28 +179,6 @@
rejection_reason_ = WebTransportHttp3RejectionReason::kWrongStatusCode;
return;
}
- bool should_validate_version =
- session_->ShouldValidateWebTransportVersion();
- if (should_validate_version) {
- auto draft_version_it = headers.find("sec-webtransport-http3-draft");
- if (draft_version_it == headers.end()) {
- QUIC_DVLOG(1) << ENDPOINT
- << "Received WebTransport headers from server without "
- "a draft version, rejecting.";
- rejection_reason_ =
- WebTransportHttp3RejectionReason::kMissingDraftVersion;
- return;
- }
- if (draft_version_it->second != "draft02") {
- QUIC_DVLOG(1) << ENDPOINT
- << "Received WebTransport headers from server with "
- "an unknown draft version ("
- << draft_version_it->second << "), rejecting.";
- rejection_reason_ =
- WebTransportHttp3RejectionReason::kUnsupportedDraftVersion;
- return;
- }
- }
}
QUIC_DVLOG(1) << ENDPOINT << "WebTransport session " << id_ << " ready.";
