Skip to content
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.

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

OCPBUGS-32860: UPSTREAM: <carry>: bump go-jose #740

Merged

Conversation

kevinrizza
Copy link
Member

go-jose has a patched vulnerability -- https://nvd.nist.gov/vuln/detail/CVE-2024-28180 operator-registry has an indirect dependency on that package as part of its grpc health probe. however, the current version of the grpc dependency relies on a deprecated version of the package. this carry commit updates github.com/grpc-ecosystem/grpc-health-probe to 0.4.24 so that we can update the indirect dependency to use the non deprecated repository for go-jose, then updates go-jose to v3.0.3 where the vulnerability is patched.

Resolves https://issues.redhat.com/browse/OCPBUGS-32860

go-jose has a patched vulnerability -- https://nvd.nist.gov/vuln/detail/CVE-2024-28180
operator-registry has an indirect dependency on that package as part of
its grpc health probe. however, the current version of the grpc dependency relies
on a deprecated version of the package. this carry commit updates
github.com/grpc-ecosystem/grpc-health-probe to 0.4.24 so that we can update
the indirect dependency to use the non deprecated repository for go-jose, then
updates go-jose to v3.0.3 where the vulnerability is patched.

Resolves https://issues.redhat.com/browse/OCPBUGS-32860

Signed-off-by: kevinrizza <krizza@redhat.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 25, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-32860, 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:

go-jose has a patched vulnerability -- https://nvd.nist.gov/vuln/detail/CVE-2024-28180 operator-registry has an indirect dependency on that package as part of its grpc health probe. however, the current version of the grpc dependency relies on a deprecated version of the package. this carry commit updates github.com/grpc-ecosystem/grpc-health-probe to 0.4.24 so that we can update the indirect dependency to use the non deprecated repository for go-jose, then updates go-jose to v3.0.3 where the vulnerability is patched.

Resolves https://issues.redhat.com/browse/OCPBUGS-32860

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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 25, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 25, 2024
@kevinrizza
Copy link
Member Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Apr 25, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-32860, 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.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state ASSIGNED, 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-32863 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-32863 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

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-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 25, 2024
@grokspawn
Copy link
Contributor

In the upstream version of this, we were updating docker and go-jose came along for the ride. It looks like this PR is trying to just bump go-jose without also bumping docker.

Shouldn't it delete these lines though?

@kevinrizza
Copy link
Member Author

@grokspawn actually, the upstream change that bumped go-jose to 3.0.1 was operator-framework/operator-registry#1197, which was a dependabot update for github.com/grpc-ecosystem/grpc-health-probe

Copy link
Contributor

@everettraven everettraven left a comment

Choose a reason for hiding this comment

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

/lgtm

@tmshort
Copy link
Contributor

tmshort commented Apr 25, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 25, 2024
Copy link
Contributor

openshift-ci bot commented Apr 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: everettraven, 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

@grokspawn
Copy link
Contributor

grokspawn commented Apr 25, 2024

@grokspawn actually, the upstream change that bumped go-jose to 3.0.1 was operator-framework/operator-registry#1197, which was a dependabot update for github.com/grpc-ecosystem/grpc-health-probe

Ah. That bumped to 3.0.1, right. But it was eventually bumped to 3.0.3 via #1239 and #1243.

If we decouple the docker and go-jose updates, that's fine.

Copy link
Contributor

openshift-ci bot commented Apr 25, 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/test-infra repository. I understand the commands that are listed here.

@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 Apr 25, 2024
@kevinrizza
Copy link
Member Author

@bandrade any chance we can get this one labeled for merge?

@jianzhangbjz
Copy link
Contributor

/label cherry-pick-approved
/lgtm

@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 May 6, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 50f148e into openshift:release-4.15 May 6, 2024
13 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

go-jose has a patched vulnerability -- https://nvd.nist.gov/vuln/detail/CVE-2024-28180 operator-registry has an indirect dependency on that package as part of its grpc health probe. however, the current version of the grpc dependency relies on a deprecated version of the package. this carry commit updates github.com/grpc-ecosystem/grpc-health-probe to 0.4.24 so that we can update the indirect dependency to use the non deprecated repository for go-jose, then updates go-jose to v3.0.3 where the vulnerability is patched.

Resolves https://issues.redhat.com/browse/OCPBUGS-32860

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-registry-container-v4.15.0-202405070106.p0.g50f148e.assembly.stream.el9 for distgit operator-registry.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202405070106.p0.g50f148e.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2024-05-07-065351

@kevinrizza
Copy link
Member Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@kevinrizza: new pull request created: #743

In response to this:

/cherry-pick release-4.14

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/test-infra repository.

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. 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/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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet