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

auto-merge envoyproxy/envoy[main] into envoyproxy/envoy-openssl[main] #262

Merged
merged 26 commits into from
Oct 3, 2024

Conversation

update-openssl-envoy[bot]
Copy link

Generated by envoy-sync-receive.sh

Risk Level: low
Testing: n/a
Docs Changes: n/a
Release Notes: inline
Fixes:

Description:
This is to address the issue:
envoyproxy/envoy#35488, i.e, integrate the
ext_proc HTTP client to ext_proc filter. With this PR, the basic
functionalities to have Envoy ext_proc filter talk to a HTTP server
using HTTP messages are accomplished.

This is the follow up of PR:
envoyproxy/envoy#35676

---------

Signed-off-by: Yanjun Xiang <[email protected]>
Update QUICHE from 42b2e66c7 to 171f6f89a
https://github.com/google/quiche/compare/42b2e66c7..171f6f89a
    
```
$ git log 42b2e66c7..171f6f89a --date=short --no-merges --format="%ad %al %s"
    
2024-09-26 birenroy Migrates code from `//third_party/spdy/core:spdy_protocol_lib` to `//third_party/http2/core:spdy_protocol`.
2024-09-26 martinduke fix asan error because the log message uses the variable about to be initialized, rather than the value being assigned.
2024-09-26 birenroy Deletes unused artifacts from //third_party/spdy.
2024-09-26 martinduke Complete processing of RESET_STREAM_AT frames. Negotiate with transport parameters and pass the frame from QuicConnection to QuicStream.
2024-09-26 birenroy Moves //third_party/spdy/core:http2_frame_decoder_adapter_fuzzer to //third_party/http2/core.
2024-09-26 birenroy Migrates code from `//third_party/spdy/core:spdy_protocol_lib` to `//third_party/http2/core:spdy_protocol`.
2024-09-26 birenroy Moves libraries from //third_party/spdy/core/hpack to //third_party/http2/hpack.
2024-09-26 rch No public description
2024-09-26 birenroy Migrates the old cc_fuzz_target in //third_party/spdy to the modern go/fuzztest framework.
2024-09-25 birenroy Migrates code from //third_party/spdy/core:spdy_framer_lib to //third_party/http2/core:spdy_framer.
2024-09-25 wub If QUIC server closes connection due to invalid hostname in SNI, use new connection close code `QUIC_HANDSHAKE_FAILED_INVALID_HOSTNAME` instead of the generic `QUIC_HANDSHAKE_FAILED`.
2024-09-25 birenroy Removes the now-unused build target //third_party/spdy/core:http2_header_block_lib.
2024-09-25 birenroy Migrates targets from `//third_party/spdy/core:spdy_alt_svc_wire_format_lib` to `//third_party/http2/core:spdy_alt_svc_wire_format`.
2024-09-25 birenroy Migrates remaining google3 users of spdy::Http2HeaderBlock to quiche::HttpHeaderBlock.
2024-09-25 birenroy Migrates code from `//third_party/spdy/core:http2_deframer_lib` to `//third_party/http2/core:http2_frame_decoder_adapter`.
2024-09-25 martinduke Roll the version number to draft-06. This will break interoperability with other MoQT implementations until we update the wire image.
2024-09-25 vasilvv Refactor MoQT interfaces to consistently pass FullTrackName around.
2024-09-24 martinduke MOQT MAX_SUBSCRIBE_ID implementation
2024-09-24 wub No public description
2024-09-24 elburrito BlindSignAuth: Update error messages to return constant strings. Messages now return at Anonymous Tokens-level granularity.
2024-09-24 wub Deprecate --quic_dispatcher_replace_cid_on_first_packet.
2024-09-23 quiche-dev No public description
2024-09-23 quiche-dev Remove quic::QuicServerId::privacy_mode_enabled()
2024-09-23 quiche-dev Enabling rolled out flags.
2024-09-23 wub No public description
2024-09-22 fayang Postpone removing handshake timeout from transport params getting negotiated to handshake complete.
2024-09-22 fayang Deliver STOP_SENDING to zombie streams.
2024-09-20 martinduke No public description
2024-09-19 vasilvv Introduce padding streams.
2024-09-19 quiche-dev QUICHE: always print ACK ranges as [a...b], except if the range is a single packet.
2024-09-19 vasilvv Split MoqtParser into MoqtControlParser and MoqtDataParser.
2024-09-18 birenroy Adds `^` and `|` to the set of allowed characters in HTTP/2 request paths.
2024-09-18 rch Add an IPv6 flow label field to QuicPacketWriterParams so that packet writers can set this field when writing packets. Currently nothing sets this field.
2024-09-18 quiche-dev No public description
2024-09-18 vasilvv Clean up MoqtTestMessage
2024-09-18 martinduke Update QuicStream to handle RESET_STREAM_AT frames.
```

---------

Signed-off-by: Fredy Wijaya <[email protected]>
Commit Message: naming: renamed the Streamer to BufferStreamer for
unification
Additional Description:
Risk Level: low.
Testing: n/a.
Docs Changes: n/a.
Release Notes: n/a.
Platform Specific Features: n/a.

Signed-off-by: wangbaiping <[email protected]>
…(#36400)

Bumps [envoyproxy/toolshed](https://github.com/envoyproxy/toolshed) from
actions-v0.2.35 to 0.2.36. This release includes the previously tagged
commit.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/ba4036f297ea35e85c22a22f630ca84391c58f9e"><code>ba4036f</code></a>
gh-actions: Release v0.2.36 (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2291">#2291</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/7bcf0c3493478d10a9fffeb456aaa2395181d0c7"><code>7bcf0c3</code></a>
<code>gh-actions/github/run</code>: Dump pre/post reporting as artefact
(<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2290">#2290</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/f3f68ac75d47ae2e92ed0cc8d88a9dd5d42f5a12"><code>f3f68ac</code></a>
chore(deps): update dependency <code>@​vercel/ncc</code> to v0.38.2 (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2275">#2275</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/46d2e918adc64041466b2d935a38c920e919474f"><code>46d2e91</code></a>
build(deps): bump pelican[markdown] in /bazel/website (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2288">#2288</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/80a9d53a9587d66138c9d8117af5b174ca5d0247"><code>80a9d53</code></a>
build(deps): bump actions/checkout in /gh-actions/github/checkout (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2284">#2284</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/79d2841ba64af401834503455635ae7399a99594"><code>79d2841</code></a>
chore(deps): update dependency <code>@​types/node</code> to v20.16.10
(<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2282">#2282</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/8e628511c4420dae2e5c9992803f33a39f248d16"><code>8e62851</code></a>
fix(deps): update dependency fetch-mock to v11.1.5 (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2283">#2283</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/a4cda41031cd7c0902256bd84c109bc2f2814e37"><code>a4cda41</code></a>
build(deps): bump actions/checkout from 4.1.7 to 4.2.0 (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2285">#2285</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/afd06213639a1c26432efe1073bbdf16838d02a4"><code>afd0621</code></a>
fix(deps): update dependency <code>@​octokit/types</code> to v13.6.0 (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2286">#2286</a>)</li>
<li><a
href="https://github.com/envoyproxy/toolshed/commit/93a48552f434017aeedb74326212fdff4ca1d0cf"><code>93a4855</code></a>
chore(deps): update typescript-eslint monorepo to v8.8.0 (<a
href="https://redirect.github.com/envoyproxy/toolshed/issues/2287">#2287</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/envoyproxy/toolshed/compare/actions-v0.2.35...actions-v0.2.36">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Ryan Northey <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan Northey <[email protected]>
Commit Message: add log line to indicate the admin server address
Risk Level: Low
Testing: n/a
Docs Changes: n/a
Release Notes: n/a
Signed-off-by: Rama Chavali <[email protected]>
…(#36368)

Commit Message: add `FROM_PEER`/`FROM_SELF` to the
transport_failure_reason string when a QUIC stream gets reset.

Risk Level: low, error reporting format change
Testing: existing tests
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

---------

Signed-off-by: Dan Zhang <[email protected]>
Co-authored-by: Dan Zhang <[email protected]>
…#36155)

Commit Message: ads-replacement: adding gRPC-mux support for ADS config
replacement
Additional Description:
Adds support for replacing the ADS config in runtime. This PR includes
the changes for the gRPC-Mux (Sotw and Delta).
First part of #35956.

Risk Level: low - requires another PR that enables this
Testing: Added unit and integration tests.
Docs Changes: N/A
Release Notes: N/A - not as part of this PR.
Platform Specific Features: N/A

---------

Signed-off-by: Adi Suissa-Peleg <[email protected]>
Commit Message: add QUIC idle timeout setting to EngineBuilder
Risk Level: Low
Testing: n/a
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: mobile only
Signed-off-by: Renjie Tang <[email protected]>
I still don't fully understand how removing the `shutdown` fixes the
issue. Although it doesn't completely fix the flakiness but it reduces
the flakiness by a lot.

Risk Level: low (tests only)
Testing: `bazel test --runs_per_test=100
//test/java/org/chromium/net:bidirectional_stream_test`
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Signed-off-by: Fredy Wijaya <[email protected]>
Commit Message: set corresponding socket options to set do not fragment
bit in IP packet header for UDP listener sockets and QUIC upstream
connection sockets.

Additional Description: also fix getLoopbackAddress() in
envoy_quic_utils.cc to use the same socket interface and v6_only bit as
peer_address.

Risk Level: medium, change the DF bit on the wire
Testing: new unit tests
Docs Changes: N/A
Release Notes: Yes
Platform Specific Features: N/A
Runtime guard: envoy.reloadable_features.udp_set_do_not_fragment

---------

Signed-off-by: Dan Zhang <[email protected]>
Co-authored-by: Dan Zhang <[email protected]>
Commit Message: router-config: remove unused field
Additional Description:
Removing unused field.

Risk Level: low
Testing: N/A
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

Signed-off-by: Adi Suissa-Peleg <[email protected]>
ravenblackx and others added 2 commits October 2, 2024 08:44
Commit Message: Error message to mention UpstreamCodec filter
Additional Description: The requirement described in
envoyproxy/envoy#26138 doesn't seem to be
mentioned in documentation, and even if it was I most likely wouldn't
have seen it and probably neither would the person who filed the issue,
so documenting the requirement in the failed validation error message
seems a more practical solution.

I also moved the function implementation out of the header file, making
for cleaner code but a more unpleasant review, sorry.

Risk Level: Only changes an error message, so ~none.
Testing: Added unit test coverage (previously coverage was partial and
from integration tests).
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Signed-off-by: Raven Black <[email protected]>
@update-openssl-envoy update-openssl-envoy bot force-pushed the auto-merge-main branch 2 times, most recently from 90273f1 to 93f8596 Compare October 2, 2024 15:46
…y (#36413)

Commit Message: Change the API on port migration to configure its
sensitivity
Additional Description: Application can now configure how many PTOs are
required to trigger port migration.
Risk Level: Low
Testing: unit test
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: mobile only

---------

Signed-off-by: Renjie Tang <[email protected]>
The `AndroidEngineExplicitFlowTest.post_multipleRequests_randomBehavior`
seems to be the one that's causing the flakiness. Adding `flaky = True`
and fixing the HTTP method to `POST` as what the test is intended seemed
to reduce the flakiness.

Risk Level: low (test only)
Testing: `bazel test --runs_per_test=100
//test/java/integration:android_engine_explicit_flow_test`
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Signed-off-by: Fredy Wijaya <[email protected]>
fredyw and others added 2 commits October 2, 2024 21:07
…etic (#36428)

Risk Level: low (test only)
Testing: `bazel test
//test/kotlin/integration/proxying:proxy_poll_perform_http_request_without_using_pac_proxy`
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Signed-off-by: Fredy Wijaya <[email protected]>
* upstream/main: (25 commits)
  mobile: Make ProxyPollPerformHTTPRequestWithoutUsingPACProxyTest hermetic (#36428)
  mobile: Mark AndroidEngineExplicitFlowTest as flaky (#36426)
  [mobile] Change the API on port migration to configure its sensitivity (#36413)
  ci: Fix coverage/docs upload redirect path (#36423)
  Revert "udp: set Don't Fragment(DF) bit in IP packet header" (#36424)
  quic: two minor coverage improvements (#36398)
  Error message to mention UpstreamCodec filter (#36367)
  router-config: remove unused field (#36401)
  udp: set Don't Fragment(DF) bit in IP packet header (#36341)
  mobile: Deflake BidirectionalStreamTest (#36412)
  [mobile]add QUIC idle timeout setting to EngineBuilder (#36388)
  github/ci: Upload coverage/docs to GCP (#36410)
  ads-replacement: adding gRPC-mux support for ADS config replacement (#36155)
  quic: report stream reset direction in reset callback failure string (#36368)
  add log line to indicate the admin server address (#36371)
  github/ci: Fix verify artefacts (#36406)
  github/ci: Fix macOS artefact name (#36402)
  ci: Workaround coverage diskspace issue (#36396)
  build(deps): bump envoyproxy/toolshed from actions-v0.2.35 to 0.2.36 (#36400)
  naming: renamed the Streamer to BufferStreamer for unification (#36397)
  ...
@tedjpoole tedjpoole merged commit 95730f7 into main Oct 3, 2024
4 checks passed
@tedjpoole tedjpoole deleted the auto-merge-main branch October 3, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.