Skip to content

Backport of [NET-4865] security: Upgrade Go and net/http CVE-2023-29406 into release/1.2.x#2645

Merged
zalimeni merged 1 commit intorelease/1.2.xfrom
backport/zalimeni/net-4865-bump-go-net_http-cve/curiously-touched-primate
Jul 25, 2023
Merged

Backport of [NET-4865] security: Upgrade Go and net/http CVE-2023-29406 into release/1.2.x#2645
zalimeni merged 1 commit intorelease/1.2.xfrom
backport/zalimeni/net-4865-bump-go-net_http-cve/curiously-touched-primate

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

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

🚨

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:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

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

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


Upgrade to Go 1.20.6 and net/http 1.12.0 to resolve CVE-2023-29406.

How I've tested this PR: tests continue to pass

How I expect reviewers to test this PR: 👀

Checklist:


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/net-4865-bump-go-net_http-cve/curiously-touched-primate branch 2 times, most recently from 7984376 to 0a35a9b Compare July 24, 2023 21:08
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Jul 24, 2023

CLA assistant check
All committers have signed the CLA.

Upgrade to Go 1.20.6 and `net/http` 1.12.0 to resolve CVE-2023-29406.
@zalimeni zalimeni force-pushed the backport/zalimeni/net-4865-bump-go-net_http-cve/curiously-touched-primate branch from 47f99d8 to 4353b04 Compare July 25, 2023 13:26
@zalimeni zalimeni marked this pull request as ready for review July 25, 2023 14:49
@zalimeni zalimeni enabled auto-merge (squash) July 25, 2023 14:49
@zalimeni zalimeni disabled auto-merge July 25, 2023 14:49
@zalimeni zalimeni enabled auto-merge (squash) July 25, 2023 14:50
@zalimeni zalimeni merged commit 1bf540c into release/1.2.x Jul 25, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-4865-bump-go-net_http-cve/curiously-touched-primate branch July 25, 2023 14:51
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