-
Notifications
You must be signed in to change notification settings - Fork 260
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
Address CVE-2022-21698 #301
Address CVE-2022-21698 #301
Conversation
Hi @pierreprinetti. Thanks for your PR. I'm waiting for a kubernetes-csi member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
724fb1d
to
6c6ca61
Compare
Upgrade the Prometheus client to v1.11.1. This commit is the result of running: ``` go get github.com/prometheus/[email protected] \ && go mod tidy && go mod vendor ``` See GHSA-cg3q-j54f-5p7p **What this PR does / why we need it**: Upgrades `github.com/prometheus/client_golang` to v1.11.1, where the vulnerability has been fixed.
6c6ca61
to
b8cf9c5
Compare
/assign @msau42 |
Pull Request Test Coverage Report for Build 2035349643
💛 - Coveralls |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/ok-to-test
@@ -9,6 +9,7 @@ require ( | |||
github.com/onsi/ginkgo v1.14.0 | |||
github.com/onsi/gomega v1.10.1 | |||
github.com/pborman/uuid v1.2.0 | |||
github.com/prometheus/client_golang v1.11.1 // indirect |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am curious where is github.com/prometheus/client_golang
lib used in this project? I could not find any code referencing prometheus/client_golang
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
o, it's referenced by
csi-driver-nfs/vendor/k8s.io/component-base/metrics/legacyregistry/registry.go
Lines 22 to 23 in 0a08bf7
"github.com/prometheus/client_golang/prometheus" | |
"github.com/prometheus/client_golang/prometheus/promhttp" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
set indirect
dependency is not ideal way in long term maintenance
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the vendor change only applies in k8s 1.24: kubernetes/kubernetes#108328
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are correct, it's indirect. The idea is to remove the explicit require
once dependencies bump it themselves.
This patch has the advantage that it can be easily backported. Shall we merge, or wait for a k8s bump? I have no strong opinion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve
thanks, let's merge this PR first.
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: andyzhangx, pierreprinetti 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 |
Upgrade the Prometheus client to v1.11.1.
This commit is the result of running:
See GHSA-cg3q-j54f-5p7p
What this PR does / why we need it:
Upgrades
github.com/prometheus/client_golang
to v1.11.1, where the vulnerability has been fixed.Which issue(s) this PR fixes:
Fixes #300
Special notes for your reviewer:
One handy way to check that the version of
client_go
used for compiling contains the security patch, is to run go mod vendor and check that theInstrumentRoundTripperCounter
method contains a variadicoptions
argument./kind bug