Skip to content

OADP-7565,OADP-7570,OADP-7573: Bump Go toolchain to 1.25.8 and fix x/* CVEs#2121

Open
kaovilai wants to merge 1 commit intoopenshift:oadp-1.5from
kaovilai:cve-fix-oadp-1.5
Open

OADP-7565,OADP-7570,OADP-7573: Bump Go toolchain to 1.25.8 and fix x/* CVEs#2121
kaovilai wants to merge 1 commit intoopenshift:oadp-1.5from
kaovilai:cve-fix-oadp-1.5

Conversation

@kaovilai
Copy link
Member

Why the changes were made

Fix multiple CVEs in the Go toolchain and golang.org/x/* dependencies. Go 1.24 is EOL; 1.25 and 1.26 are the supported releases.

Go toolchain CVEs fixed (Go 1.25.8):

  • GO-2026-4337, GO-2026-4340: crypto/tls
  • GO-2026-4341: net/url
  • GO-2026-4342: archive/zip
  • CVE-2026-25679: net/url IPv6 host parsing
  • CVE-2026-27137: crypto/x509 email constraints

golang.org/x/ CVEs fixed:*

Changes:

  • go.mod: go 1.23.0 / toolchain go1.23.6go 1.25.0 / toolchain go1.25.8
  • golang.org/x/crypto: v0.39.0 → v0.49.0
  • golang.org/x/net: v0.41.0 → v0.52.0
  • Transitive bumps: x/sys v0.42.0, x/text v0.35.0, x/term v0.41.0, x/sync v0.20.0, x/tools v0.42.0
  • konflux.Dockerfile: rhel_9_golang_1.24rhel_9_golang_1.25
  • must-gather/Dockerfile.oadp: rhel_9_golang_1.23rhel_9_golang_1.25

Jira: OADP-7565, OADP-7570, OADP-7573

How to test the changes made

  1. go build ./... — verifies compilation with new toolchain
  2. go test ./... — verifies unit tests pass
  3. CI/Prow E2E tests validate end-to-end functionality
  4. go version in built binary confirms Go 1.25.8 toolchain

Note

Responses generated with Claude

Copilot AI review requested due to automatic review settings March 17, 2026 19:55
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 17, 2026
@openshift-ci-robot
Copy link

@kaovilai: This pull request references OADP-7565 which is a valid jira issue.

This pull request references OADP-7570 which is a valid jira issue.

This pull request references OADP-7573 which is a valid jira issue.

Details

In response to this:

Why the changes were made

Fix multiple CVEs in the Go toolchain and golang.org/x/* dependencies. Go 1.24 is EOL; 1.25 and 1.26 are the supported releases.

Go toolchain CVEs fixed (Go 1.25.8):

  • GO-2026-4337, GO-2026-4340: crypto/tls
  • GO-2026-4341: net/url
  • GO-2026-4342: archive/zip
  • CVE-2026-25679: net/url IPv6 host parsing
  • CVE-2026-27137: crypto/x509 email constraints

golang.org/x/ CVEs fixed:*

  • GHSA-vvgc-356p-c3xw: golang.org/x/net XSS in HTML tokenizer (fixed in v0.38.0+, pulled in v0.52.0)
  • GHSA-j5w8-q4qc-rx2x: golang.org/x/crypto ssh DoS (fixed in v0.45.0+, pulled in v0.49.0)
  • GHSA-f6x5-jh6r-wrfv: golang.org/x/crypto ssh/agent panic (fixed in v0.45.0+, pulled in v0.49.0)

Changes:

  • go.mod: go 1.23.0 / toolchain go1.23.6go 1.25.0 / toolchain go1.25.8
  • golang.org/x/crypto: v0.39.0 → v0.49.0
  • golang.org/x/net: v0.41.0 → v0.52.0
  • Transitive bumps: x/sys v0.42.0, x/text v0.35.0, x/term v0.41.0, x/sync v0.20.0, x/tools v0.42.0
  • konflux.Dockerfile: rhel_9_golang_1.24rhel_9_golang_1.25
  • must-gather/Dockerfile.oadp: rhel_9_golang_1.23rhel_9_golang_1.25

Jira: OADP-7565, OADP-7570, OADP-7573

How to test the changes made

  1. go build ./... — verifies compilation with new toolchain
  2. go test ./... — verifies unit tests pass
  3. CI/Prow E2E tests validate end-to-end functionality
  4. go version in built binary confirms Go 1.25.8 toolchain

[!Note]
Responses generated with Claude

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 17, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 828cd423-2683-4d35-83e2-e4011a369e2b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci bot requested review from mpryc and mrnold March 17, 2026 19:56
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the project’s Go toolchain and several golang.org/x/* dependencies to address security CVEs, and aligns container build images with the newer Go major/minor release.

Changes:

  • Bump root module go.mod to go 1.25.0 and toolchain go1.25.8.
  • Update golang.org/x/* dependency versions (and corresponding go.sum entries).
  • Update builder base images in konflux.Dockerfile and must-gather/Dockerfile.oadp to rhel_9_golang_1.25.

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated 1 comment.

File Description
must-gather/Dockerfile.oadp Switches must-gather build stage to Go 1.25 builder image.
konflux.Dockerfile Switches Konflux build stage to Go 1.25 builder image.
go.mod Bumps Go language/toolchain version and updates indirect golang.org/x/* deps.
go.sum Updates checksums to match the bumped module versions.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

#@follow_tag(registry-proxy.engineering.redhat.com/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23)
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 AS builder
#@follow_tag(registry-proxy.engineering.redhat.com/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25)
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25 AS builder
@mpryc
Copy link
Contributor

mpryc commented Mar 18, 2026

/hold something is off here with the tests

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 18, 2026
…* CVEs

- Update go directive from 1.23.0 to 1.25.0, toolchain go1.23.6 -> go1.25.8
  (Go 1.24 is EOL; 1.25 and 1.26 are the supported releases)
- Bump golang.org/x/crypto v0.39.0 -> v0.49.0 (fixes GHSA-j5w8-q4qc-rx2x
  ssh DoS, GHSA-f6x5-jh6r-wrfv ssh/agent panic)
- Bump golang.org/x/net v0.41.0 -> v0.52.0 (fixes GHSA-vvgc-356p-c3xw
  XSS in HTML tokenizer)
- Transitive bumps: x/sys v0.42.0, x/text v0.35.0, x/term v0.41.0,
  x/sync v0.20.0, x/tools v0.42.0
- Update konflux.Dockerfile: rhel_9_golang_1.24 -> rhel_9_golang_1.25
- Update must-gather/Dockerfile.oadp: rhel_9_golang_1.23 -> rhel_9_golang_1.25

Go toolchain CVEs fixed:
- GO-2026-4337, GO-2026-4340 (crypto/tls)
- GO-2026-4341 (net/url)
- GO-2026-4342 (archive/zip)
- CVE-2026-25679 (net/url IPv6 host parsing)
- CVE-2026-27137 (crypto/x509 email constraints)

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
@kaovilai
Copy link
Member Author

/retest

1 similar comment
@kaovilai
Copy link
Member Author

/retest

@openshift-ci
Copy link

openshift-ci bot commented Mar 23, 2026

@kaovilai: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Copy link
Contributor

@weshayutin weshayutin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/LGTM

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 23, 2026
@openshift-ci
Copy link

openshift-ci bot commented Mar 23, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, weshayutin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@weshayutin
Copy link
Contributor

@mpryc 0/

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants