Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bp/1.29] Backport deps: updates QUICHE to incorporate fixes #32443

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions bazel/external/quiche.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2906,6 +2906,7 @@ envoy_quic_cc_library(
":quic_core_versions_lib",
":quic_platform_base",
":quiche_common_text_utils_lib",
":quiche_common_wire_serialization",
"@com_google_absl//absl/cleanup",
],
)
Expand All @@ -2929,6 +2930,7 @@ envoy_cc_library(
"quiche/quic/core/frames/quic_path_challenge_frame.cc",
"quiche/quic/core/frames/quic_path_response_frame.cc",
"quiche/quic/core/frames/quic_ping_frame.cc",
"quiche/quic/core/frames/quic_reset_stream_at_frame.cc",
"quiche/quic/core/frames/quic_retire_connection_id_frame.cc",
"quiche/quic/core/frames/quic_rst_stream_frame.cc",
"quiche/quic/core/frames/quic_stop_sending_frame.cc",
Expand Down Expand Up @@ -2956,6 +2958,7 @@ envoy_cc_library(
"quiche/quic/core/frames/quic_path_challenge_frame.h",
"quiche/quic/core/frames/quic_path_response_frame.h",
"quiche/quic/core/frames/quic_ping_frame.h",
"quiche/quic/core/frames/quic_reset_stream_at_frame.h",
"quiche/quic/core/frames/quic_retire_connection_id_frame.h",
"quiche/quic/core/frames/quic_rst_stream_frame.h",
"quiche/quic/core/frames/quic_stop_sending_frame.h",
Expand Down Expand Up @@ -3571,15 +3574,6 @@ envoy_quic_cc_library(
],
)

envoy_cc_library(
name = "quic_core_protocol_flags_list_lib",
hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"],
copts = quiche_copts,
repository = "@envoy",
tags = ["nofips"],
visibility = ["//visibility:public"],
)

envoy_quic_cc_library(
name = "quic_core_qpack_blocking_manager_lib",
srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"],
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1175,12 +1175,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "QUICHE",
project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols",
project_url = "https://github.com/google/quiche",
version = "83a9e81296b36898025bce1110db9f9c4f23afd3",
sha256 = "0bc1ca361439140b8c8add9bceb9478a037e87954bd9d22e819bf73818443026",
version = "9e875938052443c7f51b25012093be59e20598ac",
sha256 = "ae1d45c62b1a0e43384697c1becd8f8d3bf6624ba0dd05a0334b319aafecb1ef",
urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
strip_prefix = "quiche-{version}",
use_category = ["controlplane", "dataplane_core"],
release_date = "2024-01-12",
release_date = "2024-02-15",
cpe = "N/A",
license = "BSD-3-Clause",
license_url = "https://github.com/google/quiche/blob/{version}/LICENSE",
Expand Down
3 changes: 3 additions & 0 deletions changelogs/1.29.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ bug_fixes:
Fix crash due to uncaught exception when the operating system does not support an address type (such as IPv6) that is
received in an mTLS client cert IP SAN. These SANs will be ignored. This applies only when using formatter
``%DOWNSTREAM_PEER_IP_SAN%``.
- area: deps
change: |
Updated QUICHE dependencies to incorporate fixes for https://github.com/envoyproxy/envoy/issues/32401.

removed_config_or_runtime:
- area: postgres proxy
Expand Down
1 change: 0 additions & 1 deletion source/common/quic/platform/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ envoy_quiche_platform_impl_cc_library(
"//source/common/common:assert_lib",
"//source/common/http:utility_lib",
"@com_github_google_quiche//:quic_core_flags_list_lib",
"@com_github_google_quiche//:quic_core_protocol_flags_list_lib",
"@com_github_google_quiche//:quiche_protocol_flags_list_lib",
"@com_google_absl//absl/flags:flag",
],
Expand Down
4 changes: 0 additions & 4 deletions source/common/quic/platform/quiche_flags_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ template <> constexpr int32_t maybeOverride<int32_t>(absl::string_view name, int
#define PROTOCOL_FLAG_MACRO_CHOOSER(...) \
GET_6TH_ARG(__VA_ARGS__, DEFINE_PROTOCOL_FLAG_TWO_VALUES, DEFINE_PROTOCOL_FLAG_SINGLE_VALUE)

#define QUIC_PROTOCOL_FLAG(...) PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
#include "quiche/quic/core/quic_protocol_flags_list.h"
#undef QUIC_PROTOCOL_FLAG

#define QUICHE_PROTOCOL_FLAG(...) PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
#include "quiche/common/quiche_protocol_flags_list.h"
#undef QUICHE_PROTOCOL_FLAG
Expand Down
4 changes: 0 additions & 4 deletions source/common/quic/platform/quiche_flags_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ class FlagRegistry {
#include "quiche/quic/core/quic_flags_list.h"
#undef QUIC_FLAG

#define QUIC_PROTOCOL_FLAG(type, flag, ...) ABSL_DECLARE_FLAG(type, envoy_##flag);
#include "quiche/quic/core/quic_protocol_flags_list.h"
#undef QUIC_PROTOCOL_FLAG

#define QUICHE_PROTOCOL_FLAG(type, flag, ...) ABSL_DECLARE_FLAG(type, envoy_##flag);
#include "quiche/common/quiche_protocol_flags_list.h"
#undef QUICHE_PROTOCOL_FLAG
Expand Down
2 changes: 1 addition & 1 deletion test/common/quic/envoy_quic_h3_fuzz_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Delegate : public quic::QpackEncoder::DecoderStreamErrorDelegate {

static std::string encodeHeaders(const spdy::Http2HeaderBlock& headers) {
static Delegate delegate;
quic::QpackEncoder encoder(&delegate);
quic::QpackEncoder encoder(&delegate, quic::HuffmanEncoding::kEnabled);
return encoder.EncodeHeaderList(0, headers, nullptr);
}

Expand Down
2 changes: 2 additions & 0 deletions test/common/quic/platform/quiche_test_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@ inline std::string QuicheGetCommonSourcePathImpl() {
return absl::StrCat(test_srcdir, "/external/com_github_google_quiche/quiche/common");
}

class QuicheScopedDisableExitOnDFatalImpl {};

} // namespace test
} // namespace quiche
3 changes: 2 additions & 1 deletion test/common/quic/test_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ void setQuicConfigWithDefaultValues(quic::QuicConfig* config) {
std::string spdyHeaderToHttp3StreamPayload(const spdy::Http2HeaderBlock& header) {
quic::test::NoopQpackStreamSenderDelegate encoder_stream_sender_delegate;
quic::NoopDecoderStreamErrorDelegate decoder_stream_error_delegate;
auto qpack_encoder = std::make_unique<quic::QpackEncoder>(&decoder_stream_error_delegate);
auto qpack_encoder = std::make_unique<quic::QpackEncoder>(&decoder_stream_error_delegate,
quic::HuffmanEncoding::kEnabled);
qpack_encoder->set_qpack_stream_sender_delegate(&encoder_stream_sender_delegate);
// QpackEncoder does not use the dynamic table by default,
// therefore the value of |stream_id| does not matter.
Expand Down
Loading