Skip to content

OCPBUGS-31969,OCPBUGS-31970: UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288 #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 17, 2024
Merged

OCPBUGS-31969,OCPBUGS-31970: UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288 #787

merged 1 commit into from
Jun 17, 2024

Conversation

kevinrizza
Copy link
Member

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 14, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-31969, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"

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.

This pull request references Jira Issue OCPBUGS-31970, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"

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.

In response to this:

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 14, 2024
@kevinrizza
Copy link
Member Author

/bugzilla refresh

@kevinrizza
Copy link
Member Author

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 14, 2024
tmshort
tmshort approved these changes Jun 14, 2024
View reviewed changes
Copy link
Contributor

@tmshort tmshort 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 Jun 14, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevinrizza, tmshort

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

The pull request process is described here

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

@kevinrizza
Copy link
Member Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 14, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-31969, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-31939 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31939 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

This pull request references Jira Issue OCPBUGS-31970, which is valid. The bug has been moved to the POST state.

9 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-31940 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent bug Jira Issue OCPBUGS-31940 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31940 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • dependent Jira Issue OCPBUGS-31940 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

Requesting review from QA contact:
/cc @Xia-Zhao-rh

In response to this:

/jira refresh

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.

@openshift-ci openshift-ci bot requested a review from Xia-Zhao-rh June 14, 2024 18:27
@perdasilva
Copy link
Contributor

/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 15, 2024

@kevinrizza: all tests passed!

Full PR test history. Your PR dashboard.

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.

@jianzhangbjz
Copy link
Contributor

/lgtm
/label qe-approved
/label cherry-pick-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jun 17, 2024
@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 17, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-31969, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-31939 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31939 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

This pull request references Jira Issue OCPBUGS-31970, which is valid.

9 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-31940 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent bug Jira Issue OCPBUGS-31940 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31940 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • dependent Jira Issue OCPBUGS-31940 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

Requesting review from QA contact:
/cc @Xia-Zhao-rh

In response to this:

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 169e315 into openshift:release-4.14 Jun 17, 2024
13 checks passed
@openshift-ci-robot
Copy link

@kevinrizza: Jira Issue OCPBUGS-31969: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-31969 has been moved to the MODIFIED state.

Jira Issue OCPBUGS-31970: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-31970 has been moved to the MODIFIED state.

In response to this:

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.14.0-202406171008.p0.g169e315.assembly.stream.el8 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@kevinrizza
Copy link
Member Author

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link

@kevinrizza: #787 failed to apply on top of branch "release-4.13":

Applying: UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/api/go.mod
M	staging/api/go.sum
M	staging/operator-lifecycle-manager/go.mod
M	staging/operator-lifecycle-manager/go.sum
M	staging/operator-registry/go.mod
M	staging/operator-registry/go.sum
M	vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
M	vendor/golang.org/x/net/http/httpproxy/proxy.go
M	vendor/golang.org/x/net/http2/frame.go
M	vendor/golang.org/x/net/http2/pipe.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/net/http2/transport.go
M	vendor/golang.org/x/net/websocket/client.go
M	vendor/golang.org/x/net/websocket/dial.go
M	vendor/golang.org/x/sys/unix/aliases.go
M	vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd.go
M	vendor/golang.org/x/sys/unix/syscall_linux.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux.go
M	vendor/golang.org/x/sys/unix/ztypes_linux.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/net/http2/frame.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/frame.go
Auto-merging staging/operator-registry/go.sum
CONFLICT (content): Merge conflict in staging/operator-registry/go.sum
Auto-merging staging/operator-registry/go.mod
CONFLICT (content): Merge conflict in staging/operator-registry/go.mod
Auto-merging staging/operator-lifecycle-manager/go.sum
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.sum
Auto-merging staging/operator-lifecycle-manager/go.mod
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.mod
Auto-merging staging/api/go.sum
CONFLICT (content): Merge conflict in staging/api/go.sum
Auto-merging staging/api/go.mod
CONFLICT (content): Merge conflict in staging/api/go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.13

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.

@jianzhangbjz
Copy link
Contributor

/lgtm
/label qe-approved
/label cherry-pick-approved

@jianzhangbjz
Copy link
Contributor

Cherry-pick it to release-4.13 manually, see: #780

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

@tmshort tmshort tmshort approved these changes

@ankitathomas ankitathomas Awaiting requested review from ankitathomas

@perdasilva perdasilva Awaiting requested review from perdasilva

@Xia-Zhao-rh Xia-Zhao-rh Awaiting requested review from Xia-Zhao-rh

Assignees

@bandrade bandrade

@tmshort tmshort

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.