Bump golang.org/x/net to v0.55.0 and align Go toolchain to 1.26 (CVE cleanup for OCP 4.18) - #70
Merged
Merged
Conversation
golang.org/x/net/html has an XSS vulnerability via HTML parsing bypass (CVE-2026-27136) and golang.org/x/net/idna has a privilege escalation via incorrect Punycode label processing (CVE-2026-39821). Both are fixed in x/net >= v0.55.0. This stream was previously on an older, vulnerable version. Ref: HELM-814, HELM-818
The x/net bump in the previous commit raised the go.mod "go" directive to 1.25.0 as an incidental side effect of satisfying x/net v0.55.0's own module requirements. Aligning explicitly to the 1.26 line instead, since Red Hat now has newer Go 1.26.x builds available for this platform than what's currently tagged into this stream's Brew buildroot override (golang-1.26.4-1.el9_8, dbenoit-built, already shipped as RHSA-2026:29981 for other products) -- tagging it into this stream's override would also satisfy the Go >= 1.26.3 fix threshold for CVE-2026-33811 and CVE-2026-39820. Ref: HELM-816, HELM-817
- Bump GOLANGCI_LINT_VERSION v1.64 -> v2.9.0 and GOLANG_VERSION 1.24 -> 1.26 in .github/env (golangci-lint v1.64 was built with go1.24.1, which cannot lint a module with a go 1.26 directive). - Migrate .golangci.yml from the v1 config schema to v2, preserving the original lint policy (gosimple+staticcheck -> staticcheck with SA*/S* checks only, gofmt/goimports -> formatters section). - Exclude a handful of revive rules (exported, package-comments, unexported-return, var-naming) that golangci-lint v2.9.0's newer bundled revive now enables by default but weren't part of this branch's original lint policy under v1.64.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: baijum The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes for OCP Tools 4.18 (HELM-820):
golang.org/x/netv0.47.0 -> v0.55.0 (fixes CVE-2026-27136, CVE-2026-39821). This transitively bumps siblinggolang.org/x/*modules (crypto, mod, sync, sys, term, text, tools) to satisfy x/net's own go.mod requirements.godirective to 1.26, to build with the latest available Red Hat Go toolchain (golang-1.26.5-1.el9_8, already present in theocp-tools-4.18-rhel-9buildroot via RHEL z-stream inheritance — no RelEng action needed). Fixes CVE-2026-33811, CVE-2026-39820, CVE-2026-42504, which need Go >= 1.26.3/1.25.11..golangci.ymlfrom the v1 to v2 config schema and bumpgolangci-lintto v2.9.0, since v1.64 (built with go1.24.1) can't lint a module with ago 1.26directive. Preserves the original lint policy; excludes a few revive rules the newer bundled revive now enables by default that aren't part of this branch's existing lint policy.Tracking: HELM-820