Skip to content

Backport of xds: return errors from public listener finalization into release/2.0.x#23689

Open
hc-github-team-consul-core wants to merge 2 commits into
release/2.0.xfrom
backport/surabhi/secvuln-41454-envoy-listener-finalize/shortly-allowed-quetzal
Open

Backport of xds: return errors from public listener finalization into release/2.0.x#23689
hc-github-team-consul-core wants to merge 2 commits into
release/2.0.xfrom
backport/surabhi/secvuln-41454-envoy-listener-finalize/shortly-allowed-quetzal

Conversation

@hc-github-team-consul-core

Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #23686 to be assessed for backporting due to the inclusion of the label backport/2.0.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@Surabhi-1605
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


finalizePublicListenerFromConfig previously returned nil when injecting the
L4 intention (RBAC) filter or the mTLS transport socket failed, so the caller's
error handling never triggered. This returns the error from both paths so an inbound
public listener is dropped rather than served without intention enforcement or mTLS.

Adds TestFinalizePublicListenerFromConfig_PropagatesInjectionErrors, which fails
if either error is swallowed again.


Overview of commits

@hashicorp-cla-app

hashicorp-cla-app Bot commented Jun 24, 2026

Copy link
Copy Markdown

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • Surabhi-1605
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

* xds: return errors from public listener finalization

Return the errors from injectConnectFilters and injectConnectTLSForPublicListener
in finalizePublicListenerFromConfig instead of returning nil, so an inbound
public listener is never served without L4 intention enforcement or mTLS. The
callers already drop the listener when an error is returned. Adds a regression
test that fails if either error is swallowed again.

Ref: SECVULN-41454

* changelog: add security note for SECVULN-41454 (#23686)

* deps: bump go.mongodb.org/mongo-driver from 1.17.4 to 1.17.7

Fixes GHSA-cp6g-7hqx-qxhp (CVE-2026-2303), a heap out-of-bounds read in
mongo-go-driver GSSAPI error handling, flagged by the binary/container
security scans. Mirrors dependabot PR #23680.

* xds: drop internal tracker id from regression test comment
@Surabhi-1605 Surabhi-1605 enabled auto-merge (squash) June 24, 2026 12:31
@Surabhi-1605 Surabhi-1605 disabled auto-merge June 24, 2026 12:32
@Surabhi-1605 Surabhi-1605 enabled auto-merge (squash) June 24, 2026 12:32
@Surabhi-1605 Surabhi-1605 disabled auto-merge June 24, 2026 12:36
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.

3 participants