Skip to content

fix: bump golang.org/x/net to v0.60.0 (backport 2.36) - #30816

Merged
droopy4096 merged 1 commit into
release/2.36from
backport/xnet-0.60.0-release-2.36
Oct 15, 2026
Merged

droopy4096 merged 1 commit into
release/2.36from
backport/xnet-0.60.0-release-2.36

Conversation

@droopy4096

Copy link
Copy Markdown
Collaborator

Backport of the golang.org/x/net v0.60.0 bump (#30772) to release/2.36, as a minimal go.mod / go.sum change.

Tracked in Linear: ENT-211 (Iron Bank fix-by date 2026-10-29 for the Critical finding). It complements the Go bump in ENT-210: the Go bump alone does not clear GO-2026-6612 (Critical), -6603, -6610, -6611 and -6617, which are fixed in x/net v0.60.0.

golang.org/x/net is v0.57.0 here; this moves it to v0.60.0. Only golang.org/x/* modules change. The extra bumps are the minimum Go's version selection requires and cannot be held back: x/net v0.60.0 requires x/crypto v0.57.0, x/sys v0.48.0, x/term v0.46.0 and x/text v0.42.0, and x/text v0.42.0 in turn requires x/tools v0.49.0, x/mod v0.41.0 and x/sync v0.23.0. Also moved: golang.org/x/crypto v0.57.0, golang.org/x/mod v0.41.0, golang.org/x/sync v0.23.0, golang.org/x/sys v0.48.0, golang.org/x/term v0.46.0, golang.org/x/text v0.42.0, golang.org/x/tools v0.49.0, golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5. No non-x module changes.

Not built locally; CI will build it.

Opened by Superblink on behalf of @droopy4096.

@droopy4096 droopy4096 added community Pull Requests and issues created by the community. cherry-pick/v2.36 Cherry-pick PR targeting release/2.36 labels Oct 14, 2026
@github-actions

github-actions Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@linear-code

linear-code Bot commented Oct 14, 2026 •

Copy link
Copy Markdown

ENT-211

ENT-215

@coder
coder Bot requested a review from denisra October 15, 2026 15:49
droopy4096 added a commit that referenced this pull request Oct 15, 2026
Bump the Go toolchain from 1.26.5 to 1.26.9 ([released
2026-10-02](https://go.dev/doc/devel/release#go1.26.9)).

Tracked in Linear:
[ENT-210](https://linear.app/codercom/issue/ENT-210/ironbank-critical-bump-go-to-1269-fix-by-2026-10-29).
Iron Bank fix-by date for the Critical finding is **2026-10-29**.

Go 1.26.9 includes fixes for the findings Iron Bank reported against
`coder/coder-enterprise/coder-service-2:2.38.0`. Of the 19 still-valid
advisories, 12 are only fixed in 1.26.9, including the Critical one:

- Critical: [GO-2026-6612](https://pkg.go.dev/vuln/GO-2026-6612) /
CVE-2026-78663 (HTTP/2 server double flow-control refund)
- High: GO-2026-6603, -6605, -6607, -6608, -6609, -6610, -6611, -6613
- Low: GO-2026-6599, -6600, -6617

The other 7 (GO-2026-5026, -5942, -6088, -6089, -6090 High; -6091, -6218
Medium) are fixed since 1.26.6. The full list with links is in ENT-210.

## Changes

Same file set as #27157:

- `go.mod`: `go 1.26.5` to `go 1.26.9`
- `mise.toml` / `mise.lock`: Go toolchain pin and the archive URLs and
SHA-256 checksums for each platform (taken from the official `go.dev/dl`
release list)

## Verification

- `go build ./enterprise/cmd/coder` with go1.26.9 succeeds; `go mod tidy
-diff` is clean.
- `govulncheck -mode binary` on the resulting binary reports none of the
19 advisories above. The same scan of the released 2.38.0 binary
(go1.26.5) reports all 19.

## Not in this PR

`golang.org/x/net` v0.60.0 (the module-side half of GO-2026-6603, -6610,
-6611, -6612 and -6617) is already on `main` via #30772 and is
backported to the release branches in #30814 (2.38), #30815 (2.37),
#30816 (2.36), #30817 (2.35) and #30818 (2.34), tracked in
[ENT-211](https://linear.app/codercom/issue/ENT-211/ironbank-critical-bump-golangorgxnet-to-v0600-on-release-branches-fix).
The Go 1.27.1 bump (#30288) stays a separate, larger change. Go
backports: #30808 (2.38), #30809 (2.37), #30810 (2.36), #30813 (2.35),
#30811 (2.34).

Opened by Superblink on behalf of @droopy4096.
@droopy4096
droopy4096 merged commit 523009b into release/2.36 Oct 15, 2026
60 of 64 checks passed
@droopy4096
droopy4096 deleted the backport/xnet-0.60.0-release-2.36 branch October 15, 2026 19:09
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 15, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cherry-pick/v2.36 Cherry-pick PR targeting release/2.36 community Pull Requests and issues created by the community.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants