[release-4.19] OCPBUGS-103704: Replace golang.org/x/net with github.com/openshift-sustaining/net v0.35.0-sec.4

[atewari-rh]

OCPBUGS-103704: Replace golang.org/x/net with OpenShift sustaining fork

Issue: https://issues.redhat.com/browse/OCPBUGS-103704

Summary

Replace golang.org/x/net with the OpenShift sustaining fork:

golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.4

This allows oauth-apiserver to pick up the fix for CVE-2026-33814, along with the stacked x/net security backports included in this tag, without moving the component off the Go 1.22 toolchain.

Why a replace

Upstream fixed CVE-2026-33814 in golang.org/x/net v0.53.0, which requires Go 1.25.

This branch currently uses:

go 1.22.0
toolchain go1.22.1

Therefore, directly upgrading golang.org/x/net to the upstream fixed version would require a toolchain change.

Instead, this change uses the OpenShift sustaining fork's Go 1.18 / OCP 4.18 line:

github.com/openshift-sustaining/net v0.35.0-sec.4

This follows the same sustaining-fork approach used by other OCP 4.18/4.19 security updates.

Fork release: https://github.com/openshift-sustaining/net/releases/tag/v0.35.0-sec.4

Vulnerability

CVE-2026-33814 affects the HTTP/2 implementation in golang.org/x/net.

A crafted HTTP/2 SETTINGS frame with SETTINGS_MAX_FRAME_SIZE=0 can cause the transport to enter an infinite CONTINUATION write loop, resulting in a denial of service (DoS / CWE-835).

oauth-apiserver serves HTTPS through k8s.io/apiserver, which imports:

golang.org/x/net/http2

The vulnerable HTTP/2 implementation is therefore present on the serving path.

Security fixes included in v0.35.0-sec.4

The sustaining tag is cumulative and includes the following security backports:

| Tag | CVE | Package | | :--- | :---: | ---: | | sec.1 | CVE-2026-39821 | x/net/idna | | sec.2 | CVE-2026-25681 | x/net/html | | sec.3 | CVE-2026-33814 | x/net/http2 | | sec.4 | CVE-2026-27136 | x/net/html |

What changed

• Updated go.mod with the sustaining fork replace directive.

• Updated go.sum with the corresponding checksums.

• Re-vendored the dependency under vendor/.

• go mod tidy may refresh related golang.org/x/* dependencies such as:

  • x/sys

  • x/text

  • x/crypto

  • x/term

  • and other copies affected by dependency resolution.

What did not change

• No operator code changes.

• No API behavior changes.

• No OAuth token or authorization behavior changes.

• No toolchain upgrade.

• go 1.22.0 / toolchain go1.22.1 remain unchanged.

Validation

The change is limited to dependency resolution and vendored dependency updates. Existing oauth-apiserver functionality and OAuth behavior remain unchanged.

The primary goal is to consume the security fixes from the OpenShift sustaining fork while retaining compatibility with the Go 1.22 toolchain.

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[openshift-ci-robot]

@atewari-rh: This pull request references Jira Issue OCPBUGS-103704, which is invalid:

• expected dependent Jira Issue OCPBUGS-103931 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

OCPBUGS-103704: Replace golang.org/x/net with OpenShift sustaining fork

Issue: https://issues.redhat.com/browse/OCPBUGS-103704

Summary

Replace golang.org/x/net with the OpenShift sustaining fork:

golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.4

This allows oauth-apiserver to pick up the fix for CVE-2026-33814, along with the stacked x/net security backports included in this tag, without moving the component off the Go 1.22 toolchain.

Why a replace

Upstream fixed CVE-2026-33814 in golang.org/x/net v0.53.0, which requires Go 1.25.

This branch currently uses:

go 1.22.0
toolchain go1.22.1

Therefore, directly upgrading golang.org/x/net to the upstream fixed version would require a toolchain change.

Instead, this change uses the OpenShift sustaining fork's Go 1.18 / OCP 4.18 line:

github.com/openshift-sustaining/net v0.35.0-sec.4

This follows the same sustaining-fork approach used by other OCP 4.18/4.19 security updates.

Fork release: https://github.com/openshift-sustaining/net/releases/tag/v0.35.0-sec.4

Vulnerability

CVE-2026-33814 affects the HTTP/2 implementation in golang.org/x/net.

A crafted HTTP/2 SETTINGS frame with SETTINGS_MAX_FRAME_SIZE=0 can cause the transport to enter an infinite CONTINUATION write loop, resulting in a denial of service (DoS / CWE-835).

oauth-apiserver serves HTTPS through k8s.io/apiserver, which imports:

golang.org/x/net/http2

The vulnerable HTTP/2 implementation is therefore present on the serving path.

Security fixes included in v0.35.0-sec.4

The sustaining tag is cumulative and includes the following security backports:

| Tag | CVE | Package | | :--- | :---: | ---: | | sec.1 | CVE-2026-39821 | x/net/idna | | sec.2 | CVE-2026-25681 | x/net/html | | sec.3 | CVE-2026-33814 | x/net/http2 | | sec.4 | CVE-2026-27136 | x/net/html |

What changed

• Updated go.mod with the sustaining fork replace directive.

• Updated go.sum with the corresponding checksums.

• Re-vendored the dependency under vendor/.

• go mod tidy may refresh related golang.org/x/* dependencies such as:

  • x/sys

  • x/text

  • x/crypto

  • x/term

  • and other copies affected by dependency resolution.

What did not change

• No operator code changes.

• No API behavior changes.

• No OAuth token or authorization behavior changes.

• No toolchain upgrade.

• go 1.22.0 / toolchain go1.22.1 remain unchanged.

Validation

The change is limited to dependency resolution and vendored dependency updates. Existing oauth-apiserver functionality and OAuth behavior remain unchanged.

The primary goal is to consume the security fixes from the OpenShift sustaining fork while retaining compatibility with the Go 1.22 toolchain.

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]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 031a72d3-d3f8-4f84-b50e-f97156160206

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

---

_{Comment @coderabbitai help to get the list of available commands.}

[openshift-ci]

Hi @atewari-rh. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign sanchezl for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

• OWNERS

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