Skip to content

[WIP] [bp/1.40] deps: Bump bazel-registry -> 64519bb (+envoy_toolshed), tap2pcap, CVE exclude and ext_proc fuzzer fix - #49374

Draft
phlax wants to merge 7 commits into
envoyproxy:release/v1.40from
phlax:bp-1.40-registry-toolshed
Draft

phlax wants to merge 7 commits into
envoyproxy:release/v1.40from
phlax:bp-1.40-registry-toolshed

Conversation

@phlax

@phlax phlax commented Nov 18, 2026 •

Copy link
Copy Markdown
Member

From main:

With the scanner fix the CVE scan of this branch reports the eight OpenSSL 3.5.9 CVEs it used to miss, as on main (run 44295616399, on an earlier head of this branch).

Considered and left out, as they fix tests in a shape this branch does not have: #48867 (respondToHealthCheck is not on v1.40) and #49301 (the sharding answers #48973, which is not on v1.40).

Signed-off-by: Ryan Northey ryan@synca.io

@repokitteh-read-only

Copy link
Copy Markdown

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #49374 was opened by phlax.

see: more, trace.

@phlax phlax changed the title [WIP] [bp/1.40] deps: Bump bazel-registry -> f286b38 (+envoy_toolshed), ext_proc fuzzer fix [WIP] [bp/1.40] deps: Bump bazel-registry -> f286b38 (+envoy_toolshed), CVE exclude and ext_proc fuzzer fix Nov 18, 2026
dependency-envoy Bot and others added 5 commits November 18, 2026 15:44
…49389)

- `envoy_toolshed` -> 0.5.24.envoy

Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
…roxy#49360)

Change-Id: Ic669a99370269f92a16bd621b402408536e937a5

<!--
!!!ATTENTION!!!

If you are fixing **any** crash or **any** potential security issue,
**do not
open a pull request**.

Instead, please
[open a GitHub Security
Advisory](https://github.com/envoyproxy/envoy/security/advisories/new)
(preferred). Alternatively, you may email
envoy-security@googlegroups.com.

Thank you in advance for helping to keep Envoy secure.

!!!ATTENTION!!!

For an explanation of how to fill out the fields, please see the
relevant section
in
[PULL_REQUESTS.md](https://github.com/envoyproxy/envoy/blob/main/PULL_REQUESTS.md)

!!!ATTENTION!!!

Please check the [use of generative AI
policy](https://github.com/envoyproxy/envoy/blob/main/CONTRIBUTING.md?plain=1#L41).

You may use generative AI only if you fully understand the code. You
need to disclose
this usage in the PR description to ensure transparency.
-->

Commit Message:
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional [API
Considerations](https://github.com/envoyproxy/envoy/blob/main/api/review_checklist.md):]

Signed-off-by: Ethan Truong <ethantruong@google.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
The versions the branch already resolves: `envoy_toolshed` (0.5.22.envoy and later) requires both, so the older pins (2.3.3, 1.5.7.bcr.2) only produced direct dependency mismatch warnings in every workspace.

Signed-off-by: Ryan Northey <ryan@synca.io>
The `tap2pcap` tool (`@envoy_api//tools:tap2pcap`, from the traffic
tapping docs) shelled out to `od` and to Wireshark's `text2pcap`, and
its test compared `tshark` output to a golden file.

The CI image has neither tool, so `@envoy_api//tools:tap2pcap_test` only
passed while its result was in the remote cache: the API job reports
"Executed 0 out of 5 tests". Anything that changes its action key runs
it for real, and it fails with `FileNotFoundError: 'text2pcap'`, as on
envoyproxy#49376 (a `rules_python` bump).

`@envoy_toolshed//tap:defs.bzl` (envoyproxy/toolshed#5622, in
`envoy_toolshed` 0.5.24.envoy from envoyproxy#49389) writes the PCAP in Python and
is tested there. This makes the tool from that, with the v3 trace
wrapper (`envoy.data.tap.v3`, where the old tool read the frozen
`v2alpha` one), and removes `tap2pcap.py`, its test, the two fixtures,
and the test's line in `do_ci.sh api`.

For users `bazel run @envoy_api//tools:tap2pcap <tap .pb/.pb_text> <pcap
path>` is unchanged, and no longer needs Wireshark installed. Other
differences, from the toolshed implementation: IPv6 traces are written
with correct headers (a known issue of the `text2pcap` path),
`as_string` bodies are read as well as `as_bytes`, and a trace that is
not a socket buffered trace is an error.

Risk Level: Low (a developer tool and its test)
Testing: These changes ran in CI on envoyproxy#49376 against a pre-release of the
toolshed module, with a temporary target that converted the old
`tap2pcap_h2_ipv4.pb_text` fixture with the new tool; the API job
passed. The toolshed output for that fixture was also checked with
`tshark` by hand: the same six HTTP/2 frames, lengths and times as the
old golden file. Nothing in Envoy runs the tool after this change.
Docs Changes: N/A (the documented command is unchanged)
Release Notes: N/A

Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax
phlax force-pushed the bp-1.40-registry-toolshed branch from 805964a to e80b7bc Compare November 18, 2026 15:45
@phlax phlax changed the title [WIP] [bp/1.40] deps: Bump bazel-registry -> f286b38 (+envoy_toolshed), CVE exclude and ext_proc fuzzer fix [WIP] [bp/1.40] deps: Bump bazel-registry -> 64519bb (+envoy_toolshed), tap2pcap, CVE exclude and ext_proc fuzzer fix Nov 18, 2026
The test built four Docker environments (host GCC, the LLVM
prerequisites, both, neither) and checked which toolchain each got. The
environments were built by installing packages into a stock Ubuntu image
from the `ubuntu-toolchain-r/test` PPA, which often returns 503s. Of the
last 60 runs of the workflow 10 failed, and every failed job sampled
(12) died in that image build; none was a toolchain test failure.

The toolchains are hermetic now, so the environment does not decide
anything: the default is the LLVM toolchain and `--config=gcc` the GCC
one, and both are what the rest of CI builds with.

Removed:

- the `Toolchain default behavior test` workflow
(`.github/workflows/toolchain-test.yml`)
- `ci/matrix`
- `//tools/toolchain:detect`, which only the test used
- the Dependabot entry for the test's Dockerfile

What only this test covered is the explicit host GCC override,
`gcc.host` (still documented in `bazel/README.md`): nothing in CI builds
with a host GCC.

Its other checks (which compiler and standard library a build gets, that
`//bazel:gcc_build` matches with `--config=gcc`, the hermetic GCC's
sysroot) are not asserted elsewhere, but the clang and gcc CI jobs build
and test everything with those toolchains and their compiler-specific
options, and would break if the wrong one was used.

Signed-off-by: Ryan Northey <ryan@synca.io>
Backport note (release/v1.40): the workflow and the dependabot entry differ on this
branch, and are removed as they are here.

(cherry picked from commit 1e33223)
@phlax

phlax commented Nov 18, 2026

Copy link
Copy Markdown
Member Author

/retest

Signed-off-by: Ryan Northey <ryan@synca.io>
Backport note (release/v1.40): the lockfiles are regenerated for this branch
(`./ci/do_ci.sh lockfiles`) rather than picked. The release dates are this
branch's where its versions differ from `main`'s: `benchmark` and `quiche` keep
the dates they had, and `rules_apple`, `rules_cc`, `rules_foreign_cc` and
`shellcheck`, which the check reports here, are corrected.

(cherry picked from commit 8babfab)
@phlax
phlax force-pushed the bp-1.40-registry-toolshed branch from 5b8aa23 to e531cf0 Compare November 18, 2026 17:08

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants